diff options
author | Dan Lambright <dlambrig@redhat.com> | 2015-08-21 06:45:46 -0400 |
---|---|---|
committer | Dan Lambright <dlambrig@redhat.com> | 2015-09-09 14:56:36 -0700 |
commit | d55a6fee5cdda8be9dd555b4f3b5c0cc005117ef (patch) | |
tree | c747e6137038d69b0050fbe1c983c044e97c7b6b /libglusterfs/src/gfdb/gfdb_sqlite3.c | |
parent | d35b8b60d7f436c5929dfa8d647f1d41aecfc237 (diff) |
cluster/tier: add gluster v tier <vol>
Currently the tier feature piggy backs off the rebalance command
syntax to obtain status and this is clumsy. Introduce a new
tier command that can do tier specific operations, starting
with volume status to display counters.
Old commands:
gluster volume attach-tier <vol> [replica count] {bricklist..}
gluster volume detach-tier <vol> {start|stop|commit}
New commands:
gluster volume tier <vol> attach [replica count] {bricklist} |
detach {start|stop|commit} |
status
Change-Id: Ic07b3c6260588162de7d34380f8cbd3d8a7f35d3
BUG: 1255693
Signed-off-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-on: http://review.gluster.org/11984
Reviewed-by: Gaurav Kumar Garg <ggarg@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'libglusterfs/src/gfdb/gfdb_sqlite3.c')
-rw-r--r-- | libglusterfs/src/gfdb/gfdb_sqlite3.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c index f5f494f53a7..08aa7d0a380 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3.c +++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c @@ -308,7 +308,7 @@ apply_sql_params_db(gf_sql_connection_t *sql_conn, dict_t *param_dict) GF_SQL_DEFAULT_PAGE_SIZE); sql_conn->page_size = atoi(temp_str); /*Apply page_size on the sqlite db*/ - GF_SQLITE3_SET_PRAGMA(sqlite3_config_str, "page_size", "%ld", + GF_SQLITE3_SET_PRAGMA(sqlite3_config_str, "page_size", "%zd", sql_conn->page_size, ret, out); @@ -322,7 +322,7 @@ apply_sql_params_db(gf_sql_connection_t *sql_conn, dict_t *param_dict) GF_SQL_DEFAULT_CACHE_SIZE); sql_conn->cache_size = atoi(temp_str); /*Apply cache size on the sqlite db*/ - GF_SQLITE3_SET_PRAGMA(sqlite3_config_str, "cache_size", "%ld", + GF_SQLITE3_SET_PRAGMA(sqlite3_config_str, "cache_size", "%zd", sql_conn->cache_size, ret, out); @@ -354,7 +354,7 @@ apply_sql_params_db(gf_sql_connection_t *sql_conn, dict_t *param_dict) sql_conn->wal_autocheckpoint = atoi(temp_str); /*Apply wal auto check point to the sqlite db*/ GF_SQLITE3_SET_PRAGMA(sqlite3_config_str, "wal_autocheckpoint", - "%ld", sql_conn->wal_autocheckpoint, ret, out); + "%zd", sql_conn->wal_autocheckpoint, ret, out); } @@ -703,7 +703,7 @@ gf_sqlite3_find_recently_changed_files(void *db_conn, if (ret != SQLITE_OK) { gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, LG_MSG_BINDING_FAILED, "Failed binding from_time_usec " - "%ld : %s", from_time_usec, + "%"PRIu64" : %s", from_time_usec, sqlite3_errmsg(sql_conn->sqlite3_db_conn)); ret = -1; goto out; @@ -714,7 +714,7 @@ gf_sqlite3_find_recently_changed_files(void *db_conn, if (ret != SQLITE_OK) { gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, LG_MSG_BINDING_FAILED, "Failed binding from_time_usec " - "%ld : %s ", from_time_usec, + "%"PRIu64" : %s ", from_time_usec, sqlite3_errmsg(sql_conn->sqlite3_db_conn)); ret = -1; goto out; @@ -788,7 +788,7 @@ gf_sqlite3_find_unchanged_for_time (void *db_conn, if (ret != SQLITE_OK) { gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, LG_MSG_BINDING_FAILED, "Failed binding for_time_usec " - "%ld : %s", for_time_usec, + "%"PRIu64" : %s", for_time_usec, sqlite3_errmsg(sql_conn->sqlite3_db_conn)); ret = -1; goto out; @@ -799,7 +799,7 @@ gf_sqlite3_find_unchanged_for_time (void *db_conn, if (ret != SQLITE_OK) { gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, LG_MSG_BINDING_FAILED, "Failed binding for_time_usec " - "%ld : %s", for_time_usec, + "%"PRIu64" : %s", for_time_usec, sqlite3_errmsg(sql_conn->sqlite3_db_conn)); ret = -1; goto out; @@ -885,7 +885,7 @@ gf_sqlite3_find_recently_changed_files_freq (void *db_conn, if (ret != SQLITE_OK) { gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, LG_MSG_BINDING_FAILED, "Failed binding from_time_usec " - "%ld : %s", from_time_usec, + "%"PRIu64" : %s", from_time_usec, sqlite3_errmsg(sql_conn->sqlite3_db_conn)); ret = -1; goto out; @@ -908,7 +908,7 @@ gf_sqlite3_find_recently_changed_files_freq (void *db_conn, if (ret != SQLITE_OK) { gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, LG_MSG_BINDING_FAILED, "Failed binding from_time_usec " - "%ld : %s", from_time_usec, + "%"PRIu64" : %s", from_time_usec, sqlite3_errmsg(sql_conn->sqlite3_db_conn)); ret = -1; goto out; @@ -1030,7 +1030,7 @@ gf_sqlite3_find_unchanged_for_time_freq (void *db_conn, if (ret != SQLITE_OK) { gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, LG_MSG_BINDING_FAILED, "Failed binding for_time_usec " - "%ld : %s", for_time_usec, + "%"PRIu64" : %s", for_time_usec, sqlite3_errmsg(sql_conn->sqlite3_db_conn)); ret = -1; goto out; @@ -1052,7 +1052,7 @@ gf_sqlite3_find_unchanged_for_time_freq (void *db_conn, if (ret != SQLITE_OK) { gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, LG_MSG_BINDING_FAILED, "Failed binding for_time_usec " - "%ld : %s", for_time_usec, + "%"PRIu64" : %s", for_time_usec, sqlite3_errmsg(sql_conn->sqlite3_db_conn)); ret = -1; goto out; @@ -1065,7 +1065,7 @@ gf_sqlite3_find_unchanged_for_time_freq (void *db_conn, if (ret != SQLITE_OK) { gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, LG_MSG_BINDING_FAILED, "Failed binding for_time_usec " - "%ld : %s", for_time_usec, + "%"PRIu64" : %s", for_time_usec, sqlite3_errmsg(sql_conn->sqlite3_db_conn)); ret = -1; goto out; @@ -1087,7 +1087,7 @@ gf_sqlite3_find_unchanged_for_time_freq (void *db_conn, if (ret != SQLITE_OK) { gf_msg (GFDB_STR_SQLITE3, GF_LOG_ERROR, 0, LG_MSG_BINDING_FAILED, "Failed binding for_time_usec " - "%ld : %s", for_time_usec, + "%"PRIu64" : %s", for_time_usec, sqlite3_errmsg(sql_conn->sqlite3_db_conn)); ret = -1; goto out; |