diff options
| author | Atin Mukherjee <amukherj@redhat.com> | 2016-04-11 16:07:40 +0530 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2016-04-11 11:39:16 -0700 |
| commit | d129d4eea33aae5db24dba17adcb04e9d4829817 (patch) | |
| tree | 24044605fc12b071715ab4f7189672591428942c /xlators/mgmt/glusterd/src/glusterd-log-ops.c | |
| parent | 65575da24088ba4602b94db649be12376b87484f (diff) | |
glusterd: populate brickinfo->real_path conditionally
glusterd_brickinfo_new_from_brick () is called from multiple places and one of
them is glusterd_brick_rpc_notify where its very well possible that an
underlying brick's file system has crashed and a disconnect event has been
received. In this case glusterd tries to build the brickinfo from the brickid in
the RPC request, however the same fails as glusterd_brickinfo_new_from_brick ()
fails from realpath.
Fix is to skip populating real_path if its a disconnect event.
Change-Id: I9d9149c64a9cf2247abb731f219c1b1eef037960
BUG: 1325841
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: http://review.gluster.org/13965
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-log-ops.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-log-ops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-log-ops.c b/xlators/mgmt/glusterd/src/glusterd-log-ops.c index e1bb755fd3b..4d66df46132 100644 --- a/xlators/mgmt/glusterd/src/glusterd-log-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-log-ops.c @@ -146,7 +146,8 @@ glusterd_op_stage_log_rotate (dict_t *dict, char **op_errstr) goto out; } - ret = glusterd_volume_brickinfo_get_by_brick (brick, volinfo, NULL); + ret = glusterd_volume_brickinfo_get_by_brick (brick, volinfo, NULL, + _gf_true); if (ret) { snprintf (msg, sizeof (msg), "Incorrect brick %s " "for volume %s", brick, volname); @@ -205,7 +206,8 @@ glusterd_op_log_rotate (dict_t *dict) if (ret) goto cont; - ret = glusterd_brickinfo_new_from_brick (brick, &tmpbrkinfo); + ret = glusterd_brickinfo_new_from_brick (brick, &tmpbrkinfo, + _gf_true); if (ret) { gf_msg ("glusterd", GF_LOG_ERROR, 0, GD_MSG_BRICK_NOT_FOUND, |