|
 |
21ab4e |
From d59493a3c3b98f57a3bd0faae434710d1ae5a4c9 Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
Date: Thu, 9 Feb 2017 10:28:55 +0530
|
|
|
21ab4e |
Subject: [PATCH 329/361] glusterd: put null check for mod_dict in
|
|
|
21ab4e |
build_shd_graph
|
|
|
21ab4e |
|
|
|
21ab4e |
mainline:
|
|
|
21ab4e |
> BUG: 1420614
|
|
|
21ab4e |
> Reviewed-on: https://review.gluster.org/16573
|
|
|
21ab4e |
> Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
> Reviewed-by: Ravishankar N <ravishankar@redhat.com>
|
|
|
21ab4e |
> Reviewed-by: Prashanth Pai <ppai@redhat.com>
|
|
|
21ab4e |
(cherry picked from commit 5dbea2de716e9e970769ee78c24bc6cc36e76ed5)
|
|
|
21ab4e |
|
|
|
21ab4e |
BUG: 1326183
|
|
|
21ab4e |
Change-Id: I849f5f7eb5932d2dc2a76f8abc61e41231f9883e
|
|
|
21ab4e |
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/101310
|
|
|
21ab4e |
Tested-by: Milind Changire <mchangir@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
xlators/mgmt/glusterd/src/glusterd-volgen.c | 3 ++-
|
|
|
21ab4e |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
|
|
|
21ab4e |
index f661b8d..1b53e7c 100644
|
|
|
21ab4e |
--- a/xlators/mgmt/glusterd/src/glusterd-volgen.c
|
|
|
21ab4e |
+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c
|
|
|
21ab4e |
@@ -4694,7 +4694,8 @@ build_shd_graph (volgen_graph_t *graph, dict_t *mod_dict)
|
|
|
21ab4e |
goto out;
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
- graph_check = dict_get_str_boolean (mod_dict, "graph-check", 0);
|
|
|
21ab4e |
+ if (mod_dict)
|
|
|
21ab4e |
+ graph_check = dict_get_str_boolean (mod_dict, "graph-check", 0);
|
|
|
21ab4e |
iostxl = volgen_graph_add_as (graph, "debug/io-stats", "glustershd");
|
|
|
21ab4e |
if (!iostxl) {
|
|
|
21ab4e |
ret = -1;
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|