glusterd: Change the volfile to have readdir-ahead as a child

          of dht

As mentioned in feature page http://review.gluster.org/#/c/16090/
readdir-ahead will be optionally placed below dht.

There are two options:
1. performance.readdir-ahead
2. performance.parallel-readdir

If only option is enabled, then readdir ahead is placed at its
original place as an ancestor of dht. If both the options 1 and 2
are enabled then readdir ahead is placed as a child of dht.

Also changes have been made to retain the rebalance, quotad,
snapd vol files to remain unchanged.

Change-Id: I0adf0b476fcbf91251f5a2fee2241786a3d8255a
BUG: 1401812
Signed-off-by: Poornima G <pgurusid@redhat.com>
Reviewed-on: http://review.gluster.org/16072
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.h b/xlators/mgmt/glusterd/src/glusterd-volgen.h
index 2d62f720c8a..de1ba9428f5 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.h
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.h
@@ -32,6 +32,8 @@
 #define VKEY_FEATURES_TRASH       "features.trash"
 #define VKEY_FEATURES_BITROT      "features.bitrot"
 #define VKEY_FEATURES_SCRUB       "features.scrub"
+#define VKEY_PARALLEL_READDIR     "performance.parallel-readdir"
+#define VKEY_READDIR_AHEAD        "performance.readdir-ahead"
 
 #define AUTH_ALLOW_MAP_KEY "auth.allow"
 #define AUTH_REJECT_MAP_KEY "auth.reject"
@@ -55,9 +57,17 @@ typedef enum {
         GF_CLIENT_OTHER
 } glusterd_client_type_t;
 
+/* It indicates the type of volfile that the graph is built for */
+typedef enum {
+        GF_REBALANCED = 1,
+        GF_QUOTAD,
+        GF_SNAPD,
+} glusterd_graph_type_t;
+
 struct volgen_graph {
         char **errstr;
         glusterfs_graph_t graph;
+        glusterd_graph_type_t type;
 };
 typedef struct volgen_graph volgen_graph_t;