andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

client: remove the "connecting" state - it's not used

Browse Source 
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>
This commit is contained in:
Michael Adam 2018-05-29 11:56:13 +02:00 committed by Amar Tumballi
parent 13b5ab49ac
commit a2b65d01f5
4 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/volume.rc
View File

@ -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"
}

3
xlators/protocol/client/src/client-handshake.c
View File

@ -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.

2
xlators/protocol/client/src/client.c
View File

@ -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) {

1
xlators/protocol/client/src/client.h
View File

@ -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;