[sheepdog] [PATCH] sheep:Fix when the recovery is complete. ./stale directory still have objects.

[wangfan]

If sheep process have differert disk size,after recovery. ./stale directory
still have objects.because in the cluster_recovery_completion.the memcmp function
parameter vnode_info->nodes and recovereds will have different nr_vnodes
number after recovery completion.so i just compare node_id to fix this problem.

Signed-off-by: wangfan <wangfan1985 at gmail.com>
---
 sheep/ops.c   |    8 +++++---
 tests/054     |   35 +++++++++++++++++++++++++++++++++++
 tests/054.out |   22 ++++++++++++++++++++++
 tests/group   |    1 +
 4 files changed, 63 insertions(+), 3 deletions(-)
 create mode 100755 tests/054
 create mode 100644 tests/054.out

diff --git a/sheep/ops.c b/sheep/ops.c
index b9634ae..706346a 100644
--- a/sheep/ops.c
+++ b/sheep/ops.c
@@ -626,9 +626,11 @@ static int cluster_recovery_completion(const struct sd_req *req,
 
 	vnode_info = get_vnode_info();
 
-	if (vnode_info->nr_nodes == nr_recovereds &&
-	    memcmp(vnode_info->nodes, recovereds,
-		   sizeof(*recovereds) * nr_recovereds) == 0) {
+	if (vnode_info->nr_nodes == nr_recovereds){
+		for (i = 0; i <= nr_recovereds; ++i){
+			if (node_id_cmp(&vnode_info->nodes[i].nid , &recovereds[i].nid))
+				break;
+		}
 		sd_dprintf("all nodes are recovered at epoch %d", epoch);
 		if (sd_store->cleanup)
 			sd_store->cleanup();
diff --git a/tests/054 b/tests/054
new file mode 100755
index 0000000..c7336dc
--- /dev/null
+++ b/tests/054
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Test after recovery is completed.useless files have been deleted.
+
+seq=`basename $0`
+echo "QA output created by $seq"
+
+here=`pwd`
+tmp=/tmp/$$
+status=1        # failure is the default!
+
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
+
+_cleanup
+#start three in different size
+for i in 0 1 2; do
+	 $SHEEP $STORE/$i -d -z $i -p 700$i -c local store/$i -s $(($i+1))000 -y 127.0.0.1
+done
+_wait_for_sheep 3
+$COLLIE cluster format
+sleep 1
+$COLLIE vdi create test 100M -P
+$COLLIE cluster info | _filter_cluster_info
+
+#start recovery
+$SHEEP $STORE/3 -d -z 3 -p 7003 -c local store/3 -s 4000 -y 127.0.0.1
+sleep 1
+_wait_for_sheep 4
+$COLLIE cluster info | _filter_cluster_info
+
+sleep 10
+#test no object in .stale
+ls $STORE/*/obj/.stale |sort
diff --git a/tests/054.out b/tests/054.out
new file mode 100644
index 0000000..6aa47a3
--- /dev/null
+++ b/tests/054.out
@@ -0,0 +1,22 @@
+QA output created by 054
+using backend farm store
+Cluster status: running
+
+Cluster created at DATE
+
+Epoch Time           Version
+DATE      1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
+Cluster status: running
+
+Cluster created at DATE
+
+Epoch Time           Version
+DATE      2 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002, 127.0.0.1:7003]
+DATE      1 [127.0.0.1:7000, 127.0.0.1:7001, 127.0.0.1:7002]
+
+
+
+/tmp/sheepdog/0/obj/.stale:
+/tmp/sheepdog/1/obj/.stale:
+/tmp/sheepdog/2/obj/.stale:
+/tmp/sheepdog/3/obj/.stale:
diff --git a/tests/group b/tests/group
index 8d025ca..2cfb41e 100644
--- a/tests/group
+++ b/tests/group
@@ -67,3 +67,4 @@
 051 auto quick cluster md
 052 auto quick cluster md
 053 auto quick cluster md
+054 auto quick cluster md
-- 
1.7.1