summaryrefslogtreecommitdiffstats
path: root/cli/src/cli-rpc-ops.c
diff options
context:
space:
mode:
authorRavishankar N <ravishankar@redhat.com>2016-01-18 12:16:31 +0000
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-02-11 23:31:00 -0800
commitda33097c3d6492e3b468b4347e47c70828fb4320 (patch)
treed33d4362d311b4a16ebbde2baca8f3e0e1bc2828 /cli/src/cli-rpc-ops.c
parente29bf0b1f102308f114e04421d80696eebfbf6e3 (diff)
cli/ afr: op_ret for index heal launch
Problem: If index heal is launched when some of the bricks are down, glustershd of that node sends a -1 op_ret to glusterd which eventually propagates it to the CLI. Also, glusterd sometimes sends an err_str and sometimes not (depending on the failure happening in the brick-op phase or commit-op phase). So the message that gets displayed varies in each case: "Launching heal operation to perform index self heal on volume testvol has been unsuccessful" (OR) "Commit failed on <host>. Please check log file for details." Fix: 1. Modify afr_xl_op() to return -1 even if index healing of atleast one brick fails. 2. Ignore glusterd's error string in gf_cli_heal_volume_cbk and print a more meaningful message. The patch also fixes a bug in glusterfs_handle_translator_op() where if we encounter an error in notify of one xlator, we break out of the loop instead of sending the notify to other xlators. Change-Id: I957f6c4b4d0a45453ffd5488e425cab5a3e0acca BUG: 1302291 Signed-off-by: Ravishankar N <ravishankar@redhat.com> Reviewed-on: http://review.gluster.org/13303 Reviewed-by: Anuradha Talur <atalur@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'cli/src/cli-rpc-ops.c')
-rw-r--r--cli/src/cli-rpc-ops.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 4684679e557..6a296174b30 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -8469,13 +8469,10 @@ gf_cli_heal_volume_cbk (struct rpc_req *req, struct iovec *iov,
}
if (rsp.op_ret) {
- if (strcmp (rsp.op_errstr, "")) {
- cli_err ("%s", rsp.op_errstr);
- } else {
- cli_err ("%s%s on volume %s has been unsuccessful",
- operation, heal_op_str, volname);
- }
-
+ cli_err ("%s%s on volume %s has been unsuccessful on "
+ "bricks that are down. Please check if all brick "
+ "processes are running.",
+ operation, heal_op_str, volname);
ret = rsp.op_ret;
goto out;
} else {
olspan='2'>6 years release-6Adding release notes for release-6.10Rinku Kothiya6 years release-7features/bit-rot: invalid snprintf() buffer sizeDmitry Antipov5 years release-8geo-rep: Fix string comparisonKotresh HR5 years round-robin2io-threads: distribute work fairly among clientsJeff Darcy10 years testing-regression-job[DO NOT MERGE]Deepshikha khandelwal7 years  TagDownloadAuthorAge v7.8commit b4f19c7b1c...Rinku Kothiya5 years v8.2commit 895183d5a2...Rinku Kothiya5 years v8.1commit f9b8462ba2...Rinku Kothiya5 years v6.10commit 48fc076676...Rinku Kothiya6 years v7.7commit 95f167483e...Rinku Kothiya6 years v8.0commit 2e1e4168ab...Rinku Kothiya6 years v8.0rc0commit 18bd1bdaa6...Rinku Kothiya6 years v7.6commit bef7c8e54e...Rinku Kothiya6 years v6.9commit 57b48f2802...Hari Gowtham6 years v9devcommit 0e94dbb811...Rinku Kothiya6 years v8.0alphacommit f949c3e13e...Rinku Kothiya6 years v7.5commit df0a3c99dc...Rinku Kothiya6 years v5.13commit 98eb9c95fb...Hari Gowtham6 years v7.4commit 87742bdeeb...Rinku Kothiya6 years v6.8commit 1b43afb1fd...Hari Gowtham6 years v5.12commit e46e5721ac...Hari Gowtham6 years v7.3commit 1d59dc3b37...Rinku Kothiya6 years v7.2commit 7587318650...Rinku Kothiya6 years v6.7commit 366d0c6c12...Hari Gowtham6 years v7.1commit 385a37bb45...Rinku Kothiya6 years v5.11commit 7c0ef8f5c0...Hari Gowtham6 years v6.6commit 84487199af...Hari Gowtham6 years v7.0commit a92e9e8e8a...Rinku Kothiya6 years v5.10commit 3e12379fba...Hari Gowtham6 years v7.0rc3commit bac5d7d60d...Rinku Kothiya6 years v7.0rc2commit 6b3fec3793...Rinku Kothiya6 years v7.0rc1commit a2201d804d...Rinku Kothiya6 years v7.0rc0commit b3e0671a4e...Rinku Kothiya6 years v6.5commit f571e3b7bf...Hari Gowtham7 years v5.9commit 0386ca3969...Hari Gowtham7 years v5.8commit 05138aedc3...Hari Gowtham7 years v6.4commit 8761be7ba7...Hari Gowtham7 years v4.1.10commit 05efb3cafd...Hari Gowtham7 years v5.7commit d24b4605fe...Hari Gowtham7 years v8devcommit 24a3204d70...Rinku Kothiya7 years v7.0alphacommit 96702cfea3...Rinku Kothiya7 years v6.3commit 9acd89087b...Hari Gowtham7 years v4.1.9commit 735237b0ee...Hari Gowtham7 years v6.2commit 630b896166...Hari Gowtham7 years v6.1commit 5c521d403f...ShyamsundarR7 years v5.6commit 34a2347780...ShyamsundarR7 years v4.1.8commit 5c25484564...ShyamsundarR7 years v6.0commit 3fadf5cc41...ShyamsundarR7 years v5.5commit 0901b43f84...ShyamsundarR7 years v6.0rc1commit 3bcf210a5a...ShyamsundarR7 years v5.4commit c691b4a373...ShyamsundarR7 years v6.0rc0commit e6fabf8c33...ShyamsundarR7 years v7devcommit 90922d20f5...ShyamsundarR7 years v6.0alphacommit c396ba1826...ShyamsundarR7 years v4.1.7commit af2b99a04f...ShyamsundarR7 years v5.3commit dc85835297...ShyamsundarR7 years v5.2commit ae7f60235a...ShyamsundarR7 years v4.1.6commit d6383f22f0...ShyamsundarR7 years v5.1commit c12ded9ebf...ShyamsundarR7 years v5.0commit ab12861f40...ShyamsundarR7 years v3.12.15commit a1cf0f2c8b...Jiffin Tony Thottan7 years v5.0rc1commit a94a67efde...ShyamsundarR7 years v4.1.5commit 957a5e6b4a...ShyamsundarR7 years v5.0rc0commit f4594a3c88...ShyamsundarR7 years v6devcommit f15e948da3...ShyamsundarR7 years v5.0alphacommit 41388f15fc...ShyamsundarR7 years v3.12.14commit fe5b6bc852...Jiffin Tony Thottan7 years v4.1.4commit deafd5a4f8...Jiffin Tony Thottan7 years v4.1.3commit 7ddcf035b8...ShyamsundarR7 years v3.12.13commit 8727292061...Jiffin Tony Thottan7 years v4.1.2commit 044f9df659...ShyamsundarR8 years v3.12.12commit f98d86f2a3...Jiffin Tony Thottan8 years v4.1.1commit b17acca6d0...ShyamsundarR8 years v3.12.11commit 15a5367925...ShyamsundarR8 years v3.12.10commit abe2e42666...Jiffin Tony Thottan8 years v4.1.0commit b4f4480094...ShyamsundarR8 years v4.1.0rc0commit 4f591e873c...ShyamsundarR8 years v4.2devcommit a6490fe021...ShyamsundarR8 years v4.1.0alphacommit 548902d1a7...ShyamsundarR8 years v3.10.12commit c420ef1251...ShyamsundarR8 years v4.0.2-1commit 07d8cc04c4...ShyamsundarR8 years v3.12.9commit 9d883f31db...ShyamsundarR8 years v4.0.2commit 92cc124298...ShyamsundarR8 years v3.12.8commit 318d2c833f...Jiffin Tony Thottan8 years v4.0.1commit 17b43ec3d2...ShyamsundarR8 years v3.12.7commit 5a1fcd2636...Jiffin Tony Thottan8 years v4.0.0-2commit 2628a91eaa...ShyamsundarR8 years v4.0.0commit c1c43f8601...ShyamsundarR8 years v3.10.11commit 39716f601d...ShyamsundarR8 years v4.0.0rc1commit 8b85778185...ShyamsundarR8 years v3.12.6commit c5146ab5ad...Jiffin Tony Thottan8 years v4.0.0rc0commit 4c74d7ffb6...ShyamsundarR8 years v3.10.10commit dd038cc99a...ShyamsundarR8 years v4.1devcommit 93f21655e1...ShyamsundarR8 years v4.0.0alphacommit 7379f89de9...ShyamsundarR8 years v3.13.2commit ee067308c3...ShyamsundarR8