From 0628c77f9069e93c49993722ac577becfcf902db Mon Sep 17 00:00:00 2001 From: Dan Lambright Date: Fri, 21 Aug 2015 06:45:46 -0400 Subject: cluster/tier: add gluster v tier This is a backport of 11984. > 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 [replica count] {bricklist..} > gluster volume detach-tier {start|stop|commit} > New commands: > gluster volume tier attach [replica count] {bricklist} | > detach {start|stop|commit} | > status > Change-Id: Ic07b3c6260588162de7d34380f8cbd3d8a7f35d3 > BUG: 1255693 > Signed-off-by: Dan Lambright > Reviewed-on: http://review.gluster.org/11984 > Reviewed-by: Gaurav Kumar Garg > Tested-by: Gluster Build System Signed-off-by: Dan Lambright Change-Id: Id45bd0fa6b8606dd47863de83a694908da393229 BUG: 1261664 Signed-off-by: Dan Lambright Reviewed-on: http://review.gluster.org/12143 Tested-by: Gluster Build System Reviewed-by: Gaurav Kumar Garg --- libglusterfs/src/gfdb/gfdb_sqlite3.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'libglusterfs/src') diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3.c b/libglusterfs/src/gfdb/gfdb_sqlite3.c index 611e0fdf745..27ebef39882 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3.c +++ b/libglusterfs/src/gfdb/gfdb_sqlite3.c @@ -306,7 +306,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); @@ -320,7 +320,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); @@ -352,7 +352,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); } @@ -701,7 +701,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; @@ -712,7 +712,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; @@ -786,7 +786,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; @@ -797,7 +797,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; @@ -883,7 +883,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; @@ -906,7 +906,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; @@ -1028,7 +1028,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; @@ -1050,7 +1050,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; @@ -1063,7 +1063,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; @@ -1085,7 +1085,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; -- cgit