From: Sage Weil <sage@redhat.com>
Date: Wed, 11 Nov 2015 14:14:01 +0000 (-0500)
Subject: Merge pull request #6385 from Vicente-Cheng/mkfs-does-not-decode-an-existing-superblock
X-Git-Tag: v10.0.1~93
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88fe7810a889b5e8583c4bc4840336bd334c5690;p=ceph.git

Merge pull request #6385 from Vicente-Cheng/mkfs-does-not-decode-an-existing-superblock

osd: fix reactivate (check OSDSuperblock in mkfs() when we already have the superblock)

Reviewed-by: Loic Dachary <ldachary@redhat.com>
---

88fe7810a889b5e8583c4bc4840336bd334c5690
diff --cc src/test/Makefile.am
index 7bbab2891206,8da39135648c..448c9b46609b
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@@ -79,9 -79,9 +79,10 @@@ check_SCRIPTS += 
  	test/mon/mkfs.sh \
  	test/mon/mon-scrub.sh \
  	test/osd/osd-scrub-repair.sh \
 +	test/osd/osd-scrub-snaps.sh \
  	test/osd/osd-config.sh \
  	test/osd/osd-bench.sh \
+ 	test/osd/osd-reactivate.sh \
  	test/osd/osd-copy-from.sh \
  	test/mon/mon-handle-forward.sh \
  	test/libradosstriper/rados-striper.sh \