50dc83
From 310e09d46cdb293e4af2df0085b8ac45d5c17933 Mon Sep 17 00:00:00 2001
50dc83
From: Atin Mukherjee <amukherj@redhat.com>
50dc83
Date: Tue, 16 Apr 2019 17:20:34 +0530
50dc83
Subject: [PATCH 111/124] glusterd: fix loading ctime in client graph logic
50dc83
50dc83
Commit efbf8ab wasn't handling all the scenarios of toggling ctime
50dc83
option correctly and more over a ! had completely tossed up the logic.
50dc83
50dc83
> upstream patch : https://review.gluster.org/#/c/glusterfs/+/22578/
50dc83
50dc83
>Fixes: bz#1697907
50dc83
>Change-Id: If12e2f69045e59878992ee2cd0518cc0eabcce0d
50dc83
>Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
50dc83
50dc83
BUG: 1697820
50dc83
Change-Id: If12e2f69045e59878992ee2cd0518cc0eabcce0d
50dc83
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
50dc83
Reviewed-on: https://code.engineering.redhat.com/gerrit/168048
50dc83
Tested-by: RHGS Build Bot <nigelb@redhat.com>
50dc83
---
50dc83
 xlators/mgmt/glusterd/src/glusterd-volgen.c | 12 +++++++++---
50dc83
 1 file changed, 9 insertions(+), 3 deletions(-)
50dc83
50dc83
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
50dc83
index 324ec2f..da877aa 100644
50dc83
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
50dc83
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
50dc83
@@ -4358,9 +4358,15 @@ client_graph_builder(volgen_graph_t *graph, glusterd_volinfo_t *volinfo,
50dc83
             goto out;
50dc83
         }
50dc83
     }
50dc83
-
50dc83
-    if (conf->op_version >= GD_OP_VERSION_5_0 &&
50dc83
-        !dict_get_str_boolean(set_dict, "features.ctime", _gf_false)) {
50dc83
+    /* a. ret will be -1 if features.ctime is not set in the volinfo->dict which
50dc83
+     * means ctime should be loaded into the graph.
50dc83
+     * b. ret will be 1 if features.ctime is explicitly turned on through
50dc83
+     * volume set and in that case ctime should be loaded into the graph.
50dc83
+     * c. ret will be 0 if features.ctime is explicitly turned off and in that
50dc83
+     * case ctime shouldn't be loaded into the graph.
50dc83
+     */
50dc83
+    ret = dict_get_str_boolean(set_dict, "features.ctime", -1);
50dc83
+    if (conf->op_version >= GD_OP_VERSION_5_0 && ret) {
50dc83
         xl = volgen_graph_add(graph, "features/utime", volname);
50dc83
         if (!xl) {
50dc83
             ret = -1;
50dc83
-- 
50dc83
1.8.3.1
50dc83