|
 |
3604df |
From c9a0fad614df6803dc5b377ca48d98141608e8aa Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Kaushal M <kaushal@redhat.com>
|
|
|
3604df |
Date: Thu, 5 May 2016 14:19:55 +0530
|
|
|
3604df |
Subject: [PATCH 90/94] glusterfsd: explicitly turn on encryption for volfile fetch
|
|
|
3604df |
|
|
|
3604df |
Problem: In case of encrypted transport RPC clients not able to
|
|
|
3604df |
reconnect.due to this daemon(glustershd etc) not able to
|
|
|
3604df |
fetch volfile and not started.
|
|
|
3604df |
|
|
|
3604df |
Solution: After turn on encryption explictly to fetch volfile
|
|
|
3604df |
issue is resolved.
|
|
|
3604df |
|
|
|
3604df |
> Change-Id: I58e1fe7f5edf0abb5732432291ff677e81429b79
|
|
|
3604df |
> BUG: 1333317
|
|
|
3604df |
> Signed-off-by: Kaushal M <kaushal@redhat.com>
|
|
|
3604df |
> Reviewed-on: http://review.gluster.org/14253
|
|
|
3604df |
> Smoke: Gluster Build System <jenkins@build.gluster.com>
|
|
|
3604df |
> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
|
|
|
3604df |
> Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
|
|
|
3604df |
> (cherry picked from commit 60d235515e582319474ba7231aad490d19240642)
|
|
|
3604df |
|
|
|
3604df |
>Reviewed-on: http://review.gluster.org/15567
|
|
|
3604df |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
3604df |
>Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
3604df |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
3604df |
|
|
|
3604df |
Change-Id: I15193837dc692b0cd7df942843bcf27a1c47e695
|
|
|
3604df |
BUG: 1378528
|
|
|
3604df |
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/85897
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
glusterfsd/src/glusterfsd-mgmt.c | 13 +++++++++++++
|
|
|
3604df |
1 files changed, 13 insertions(+), 0 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
|
|
|
3604df |
index e257659..2a090eb 100644
|
|
|
3604df |
--- a/glusterfsd/src/glusterfsd-mgmt.c
|
|
|
3604df |
+++ b/glusterfsd/src/glusterfsd-mgmt.c
|
|
|
3604df |
@@ -2154,6 +2154,19 @@ glusterfs_mgmt_init (glusterfs_ctx_t *ctx)
|
|
|
3604df |
if (ret)
|
|
|
3604df |
goto out;
|
|
|
3604df |
|
|
|
3604df |
+ /* Explicitly turn on encrypted transport. */
|
|
|
3604df |
+ if (ctx->secure_mgmt) {
|
|
|
3604df |
+ ret = dict_set_dynstr_with_alloc
|
|
|
3604df |
+ (options, "transport.socket.ssl-enabled", "yes");
|
|
|
3604df |
+ if (ret) {
|
|
|
3604df |
+ gf_log (THIS->name, GF_LOG_ERROR,
|
|
|
3604df |
+ "failed to set 'transport.socket.ssl-enabled' "
|
|
|
3604df |
+ "in options dict");
|
|
|
3604df |
+ goto out;
|
|
|
3604df |
+
|
|
|
3604df |
+ }
|
|
|
3604df |
+ }
|
|
|
3604df |
+
|
|
|
3604df |
rpc = rpc_clnt_new (options, THIS, THIS->name, 8);
|
|
|
3604df |
if (!rpc) {
|
|
|
3604df |
ret = -1;
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|