summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorDan Lambright <dlambrig@redhat.com>2015-10-19 20:42:56 -0400
committerDan Lambright <dlambrig@redhat.com>2015-10-20 10:16:43 -0700
commita7b57f8a0d24d0ed1cd3a8700e52f70181000038 (patch)
treeb669ce200e0f9e277b679ad1452bf51cefc84806 /xlators
parentaa2373dab1fe2e5d5554f7cba1b77de621bb2ddf (diff)
cluster/tier do not abort migration if a single brick is down
When a bricks are down, promotion/demotion should still be possible. For example, if an EC brick is down, the other bricks are able to recover the data and migrate it. Change-Id: I8e650c640bce22a3ad23d75c363fbb9fd027d705 BUG: 1273215 Signed-off-by: Dan Lambright <dlambrig@redhat.com> Reviewed-on: http://review.gluster.org/12397 Tested-by: NetBSD Build System <jenkins@build.gluster.org> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Joseph Fernandes
Diffstat (limited to 'xlators')
-rw-r--r--xlators/cluster/dht/src/tier.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/xlators/cluster/dht/src/tier.c b/xlators/cluster/dht/src/tier.c
index 81464a81576..d85fe41dcb0 100644
--- a/xlators/cluster/dht/src/tier.c
+++ b/xlators/cluster/dht/src/tier.c
@@ -909,8 +909,8 @@ tier_process_brick (tier_brick_list_t *local_brick, void *args) {
GFDB_IPC_CTR_GET_DB_PARAM_OPS);
if (ret) {
gf_msg ("tier", GF_LOG_ERROR, 0,\
- LG_MSG_SET_PARAM_FAILED, "Failed setting %s "\
- "to params dictionary", GFDB_IPC_CTR_KEY);\
+ LG_MSG_SET_PARAM_FAILED, "Failed setting %s "
+ "to params dictionary", GFDB_IPC_CTR_KEY);
goto out;
}
@@ -918,17 +918,17 @@ tier_process_brick (tier_brick_list_t *local_brick, void *args) {
GFDB_IPC_CTR_GET_DB_PARAM_OPS, "");
if (ret) {
gf_msg ("tier", GF_LOG_ERROR, 0,\
- LG_MSG_SET_PARAM_FAILED, "Failed setting %s "\
+ LG_MSG_SET_PARAM_FAILED, "Failed setting %s "
"to params dictionary",
- GFDB_IPC_CTR_GET_DB_PARAM_OPS);\
+ GFDB_IPC_CTR_GET_DB_PARAM_OPS);
goto out;
}
ret = dict_set_str (ctr_ipc_in_dict,
GFDB_IPC_CTR_GET_DB_KEY, "journal_mode");
if (ret) {
- gf_msg ("tier", GF_LOG_ERROR, 0,\
- LG_MSG_SET_PARAM_FAILED, "Failed setting %s "\
+ gf_msg ("tier", GF_LOG_ERROR, 0,
+ LG_MSG_SET_PARAM_FAILED, "Failed setting %s "
"to params dictionary",
GFDB_IPC_CTR_GET_DB_KEY);\
goto out;
@@ -948,10 +948,10 @@ tier_process_brick (tier_brick_list_t *local_brick, void *args) {
ret = dict_get_str (ctr_ipc_out_dict, "journal_mode", &strval);
if (ret) {
- gf_msg ("tier", GF_LOG_ERROR, 0,\
- LG_MSG_GET_PARAM_FAILED, "Failed getting %s "\
- "to params dictionary",
- "journal_mode");\
+ gf_msg ("tier", GF_LOG_ERROR, 0,
+ LG_MSG_GET_PARAM_FAILED, "Failed getting %s "
+ "to params dictionary"
+ "journal_mode", strval);
goto out;
}
@@ -1036,8 +1036,8 @@ tier_build_migration_qfile (demotion_args_t *args,
if (ret) {
gf_msg (args->this->name, GF_LOG_ERROR, 0,
DHT_MSG_BRICK_QUERY_FAILED,
- "Brick query failed\n");
- goto out;
+ "Brick %s query failed\n",
+ local_brick->brick_db_path);
}
}
ret = 0;