diff options
-rwxr-xr-x | run-tests.sh | 6 | ||||
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/run-tests.sh b/run-tests.sh index 2d1191ae0d7..7a41dcfa3a3 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -194,8 +194,7 @@ function run_tests() function is_bad_test () { local name=$1 - for bt in ./tests/basic/volume-snapshot-clone.t \ - ./tests/basic/uss.t \ + for bt in ./tests/basic/uss.t \ ./tests/bugs/replicate/bug-976800.t \ ./tests/bugs/replicate/bug-1015990.t \ ./tests/bugs/quota/bug-1038598.t \ @@ -211,12 +210,9 @@ function is_bad_test () ./tests/basic/ec/ec-5-1.t \ ./tests/basic/ec/ec-12-4.t \ ./tests/bugs/quota/bug-1035576.t \ - ./tests/basic/uss.t \ ./tests/bugs/glusterfs/bug-867253.t \ ./tests/bugs/glusterd/bug-974007.t \ - ./tests/basic/volume-snapshot-clone.t \ ./tests/basic/quota-anon-fd-nfs.t \ - ./tests/bugs/snapshot/bug-1112559.t \ ./tests/bugs/disperse/bug-1187474.t \ ./tests/basic/afr/sparse-file-self-heal.t \ ./tests/basic/afr/data-self-heal.t \ diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 83fa799c2a5..b297ed16443 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -4791,6 +4791,9 @@ __glusterd_peer_rpc_notify (struct rpc_clnt *rpc, void *mydata, gf_log (this->name, GF_LOG_DEBUG, "got RPC_CLNT_CONNECT"); peerinfo->connected = 1; peerinfo->quorum_action = _gf_true; + peerinfo->generation = uatomic_add_return + (&conf->generation, 1); + peerctx->peerinfo_gen = peerinfo->generation; ret = glusterd_peer_dump_version (this, rpc, peerctx); if (ret) |