summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2018-05-29 11:56:13 +0200
committerAmar Tumballi <amarts@redhat.com>2018-06-21 05:37:09 +0000
commita2b65d01f5feb68a3bf56399c7815e5f0a73101f (patch)
tree0273fd9fb9f4bef2b24b548d8df12cfe5fa07d0f
parent13b5ab49ac8f700eab0f32011e0d42b789ab00ab (diff)
client: remove the "connecting" state - it's not used
The "connecting" state is not used anywhere really. It's only being set and printed. So remove it. Change-Id: I11fc8b0bdcda5a812d065543aa447d39957d3b38 fixes: bz#1583583 Signed-off-by: Michael Adam <obnox@samba.org>
-rw-r--r--tests/volume.rc2
-rw-r--r--xlators/protocol/client/src/client-handshake.c3
-rw-r--r--xlators/protocol/client/src/client.c2
-rw-r--r--xlators/protocol/client/src/client.h1
4 files changed, 1 insertions, 7 deletions
diff --git a/tests/volume.rc b/tests/volume.rc
index ea8cfb666a1..492b08a4d9d 100644
--- a/tests/volume.rc
+++ b/tests/volume.rc
@@ -139,7 +139,7 @@ function cleanup_mount_statedump {
function snap_client_connected_status {
local vol=$1
local fpath=$(generate_mount_statedump $vol)
- up=$(grep -a -A2 xlator.protocol.client.$vol-snapd-client.priv $fpath | tail -1 | cut -f 2 -d'=')
+ up=$(grep -a -A1 xlator.protocol.client.$vol-snapd-client.priv $fpath | tail -1 | cut -f 2 -d'=')
rm -f $fpath
echo "$up"
}
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index 1c705f59404..1c1ec5ce7e1 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -1176,7 +1176,6 @@ client_setvolume_cbk (struct rpc_req *req, struct iovec *iov, int count, void *m
remote_subvol);
op_ret = 0;
- conf->connecting = 0;
conf->connected = 1;
client_post_handshake (frame, frame->this);
@@ -1189,7 +1188,6 @@ out:
gf_msg (this->name, GF_LOG_INFO, 0,
PC_MSG_AUTH_FAILED_NOTIFY_FAILED, "notify of "
"AUTH_FAILED failed");
- conf->connecting = 0;
conf->connected = 0;
ret = -1;
}
@@ -1207,7 +1205,6 @@ out:
gf_msg (this->name, GF_LOG_INFO, 0,
PC_MSG_CHILD_CONNECTING_NOTIFY_FAILED,
"notify of CHILD_CONNECTING failed");
- conf->connecting= 1;
/*
* The reconnection *won't* happen in the background (see
* previous comment) unless we kill the current connection.
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index 0d0267d8f62..bc1322573e2 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -2795,8 +2795,6 @@ client_priv_dump (xlator_t *this)
}
pthread_spin_unlock (&conf->fd_lock);
- gf_proc_dump_write("connecting", "%d", conf->connecting);
-
gf_proc_dump_write ("connected", "%d", conf->connected);
if (conf->rpc) {
diff --git a/xlators/protocol/client/src/client.h b/xlators/protocol/client/src/client.h
index 5ee480367cb..b72404f5639 100644
--- a/xlators/protocol/client/src/client.h
+++ b/xlators/protocol/client/src/client.h
@@ -189,7 +189,6 @@ typedef struct clnt_conf {
pthread_spinlock_t fd_lock; /* protects saved_fds list
* and all fdctx */
pthread_mutex_t lock;
- int connecting;
int connected;
rpc_clnt_prog_t *fops;