diff options
Diffstat (limited to '0240-Revert-glusterd-shd-Optimize-the-glustershd-manager-.patch')
| -rw-r--r-- | 0240-Revert-glusterd-shd-Optimize-the-glustershd-manager-.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/0240-Revert-glusterd-shd-Optimize-the-glustershd-manager-.patch b/0240-Revert-glusterd-shd-Optimize-the-glustershd-manager-.patch new file mode 100644 index 0000000..54ef75e --- /dev/null +++ b/0240-Revert-glusterd-shd-Optimize-the-glustershd-manager-.patch @@ -0,0 +1,54 @@ +From 9b3adb28207681f49ea97fc2c473634ff0f73db6 Mon Sep 17 00:00:00 2001 +From: Mohammed Rafi KC <rkavunga@redhat.com> +Date: Thu, 11 Jul 2019 12:46:35 +0530 +Subject: [PATCH 240/255] Revert "glusterd/shd: Optimize the glustershd manager + to send reconfigure" + +This reverts commit 321080e55f0ae97115a9542ba5de8494e7610860. + +BUG: 1471742 +Change-Id: I5fa84baa3c3e72ca8eb605c7f1fafb53c68859f9 +Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com> +Reviewed-on: https://code.engineering.redhat.com/gerrit/175949 +Tested-by: RHGS Build Bot <nigelb@redhat.com> +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com> +--- + libglusterfs/src/graph.c | 1 + + xlators/mgmt/glusterd/src/glusterd-shd-svc.c | 9 ++++----- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c +index 27d9335..18fb2d9 100644 +--- a/libglusterfs/src/graph.c ++++ b/libglusterfs/src/graph.c +@@ -1497,6 +1497,7 @@ glusterfs_process_svc_detach(glusterfs_ctx_t *ctx, gf_volfile_t *volfile_obj) + parent_graph->last_xl = glusterfs_get_last_xlator(parent_graph); + parent_graph->xl_count -= graph->xl_count; + parent_graph->leaf_count -= graph->leaf_count; ++ default_notify(xl, GF_EVENT_PARENT_DOWN, xl); + parent_graph->id++; + ret = 0; + } +diff --git a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c +index d81d760..981cc87 100644 +--- a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c ++++ b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c +@@ -311,11 +311,10 @@ glusterd_shdsvc_manager(glusterd_svc_t *svc, void *data, int flags) + */ + ret = svc->stop(svc, SIGTERM); + } else if (volinfo) { +- if (volinfo->status != GLUSTERD_STATUS_STARTED) { +- ret = svc->stop(svc, SIGTERM); +- if (ret) +- goto out; +- } ++ ret = svc->stop(svc, SIGTERM); ++ if (ret) ++ goto out; ++ + if (volinfo->status == GLUSTERD_STATUS_STARTED) { + ret = svc->start(svc, flags); + if (ret) +-- +1.8.3.1 + |