From adebf22d3c6b40a9fd039ddd54f495eeb4410f90 Mon Sep 17 00:00:00 2001 From: Min Chen Date: Thu, 5 Feb 2015 08:25:39 +0800 Subject: [PATCH] rbd_recover_tool: move rbd_recover_tool directory to src/tools subdirectory Signed-off-by: Min Chen --- src/{ => tools}/rbd_recover_tool/FAQ | 6 +++--- src/{ => tools}/rbd_recover_tool/README | 4 ++-- src/{ => tools}/rbd_recover_tool/TODO | 0 src/{ => tools}/rbd_recover_tool/common_h | 0 src/{ => tools}/rbd_recover_tool/config/mds_host | 0 src/{ => tools}/rbd_recover_tool/config/mon_host | 0 src/{ => tools}/rbd_recover_tool/config/osd_host_path | 0 src/{ => tools}/rbd_recover_tool/database_h | 0 src/{ => tools}/rbd_recover_tool/epoch_h | 0 src/{ => tools}/rbd_recover_tool/metadata_h | 0 src/{ => tools}/rbd_recover_tool/osd_job | 0 src/{ => tools}/rbd_recover_tool/rbd-recover-tool | 0 src/{ => tools}/rbd_recover_tool/test_rbd_recover_tool.sh | 0 13 files changed, 5 insertions(+), 5 deletions(-) rename src/{ => tools}/rbd_recover_tool/FAQ (60%) rename src/{ => tools}/rbd_recover_tool/README (97%) rename src/{ => tools}/rbd_recover_tool/TODO (100%) rename src/{ => tools}/rbd_recover_tool/common_h (100%) rename src/{ => tools}/rbd_recover_tool/config/mds_host (100%) rename src/{ => tools}/rbd_recover_tool/config/mon_host (100%) rename src/{ => tools}/rbd_recover_tool/config/osd_host_path (100%) rename src/{ => tools}/rbd_recover_tool/database_h (100%) rename src/{ => tools}/rbd_recover_tool/epoch_h (100%) rename src/{ => tools}/rbd_recover_tool/metadata_h (100%) rename src/{ => tools}/rbd_recover_tool/osd_job (100%) rename src/{ => tools}/rbd_recover_tool/rbd-recover-tool (100%) rename src/{ => tools}/rbd_recover_tool/test_rbd_recover_tool.sh (100%) diff --git a/src/rbd_recover_tool/FAQ b/src/tools/rbd_recover_tool/FAQ similarity index 60% rename from src/rbd_recover_tool/FAQ rename to src/tools/rbd_recover_tool/FAQ index b94b37ea2d30..1655e8530413 100644 --- a/src/rbd_recover_tool/FAQ +++ b/src/tools/rbd_recover_tool/FAQ @@ -4,13 +4,13 @@ cause: database is old, refresh database solution: - ./admin_job database + ./rbd-recover-tool database 2. Error initializing leveldb: IO error: lock /var/lib/ceph/osd/ceph-0/current/omap/LOCK: Resource temporarily unavailable ERROR: error flushing journal /var/lib/ceph/osd/ceph-0/journal for object store /var/lib/ceph/osd/ceph-0: (1) Operation not permitted cause: - when ./admin_job database is interrupted , but command has been sent to each osd node, and there is a process reading leveldb and it is LOCKED - if run ./admin_job database again, all command are sent to osd nodes again, while previous process is locking leveldb, so all new command + when ./rbd-recover-tool database is interrupted , but command has been sent to each osd node, and there is a process reading leveldb and it is LOCKED + if run ./rbd-recover-tool database again, all command are sent to osd nodes again, while previous process is locking leveldb, so all new command are failed. solution: wait until all previous command finished. diff --git a/src/rbd_recover_tool/README b/src/tools/rbd_recover_tool/README similarity index 97% rename from src/rbd_recover_tool/README rename to src/tools/rbd_recover_tool/README index 2e45ad2bcdbb..73c19b9d3be9 100644 --- a/src/rbd_recover_tool/README +++ b/src/tools/rbd_recover_tool/README @@ -1,6 +1,6 @@ -# author: min chen(minchen@ubuntukylin.com) 2014 2015 +# author: Min chen(minchen@ubuntukylin.com) 2014 2015 -------------- ceph rbd recovery tool ------------- +------------- ceph rbd recover tool ------------- ceph rbd recover tool is used for recovering ceph rbd image, when all ceph services are killed. it is based on ceph-0.80.x (Firefly and newer) diff --git a/src/rbd_recover_tool/TODO b/src/tools/rbd_recover_tool/TODO similarity index 100% rename from src/rbd_recover_tool/TODO rename to src/tools/rbd_recover_tool/TODO diff --git a/src/rbd_recover_tool/common_h b/src/tools/rbd_recover_tool/common_h similarity index 100% rename from src/rbd_recover_tool/common_h rename to src/tools/rbd_recover_tool/common_h diff --git a/src/rbd_recover_tool/config/mds_host b/src/tools/rbd_recover_tool/config/mds_host similarity index 100% rename from src/rbd_recover_tool/config/mds_host rename to src/tools/rbd_recover_tool/config/mds_host diff --git a/src/rbd_recover_tool/config/mon_host b/src/tools/rbd_recover_tool/config/mon_host similarity index 100% rename from src/rbd_recover_tool/config/mon_host rename to src/tools/rbd_recover_tool/config/mon_host diff --git a/src/rbd_recover_tool/config/osd_host_path b/src/tools/rbd_recover_tool/config/osd_host_path similarity index 100% rename from src/rbd_recover_tool/config/osd_host_path rename to src/tools/rbd_recover_tool/config/osd_host_path diff --git a/src/rbd_recover_tool/database_h b/src/tools/rbd_recover_tool/database_h similarity index 100% rename from src/rbd_recover_tool/database_h rename to src/tools/rbd_recover_tool/database_h diff --git a/src/rbd_recover_tool/epoch_h b/src/tools/rbd_recover_tool/epoch_h similarity index 100% rename from src/rbd_recover_tool/epoch_h rename to src/tools/rbd_recover_tool/epoch_h diff --git a/src/rbd_recover_tool/metadata_h b/src/tools/rbd_recover_tool/metadata_h similarity index 100% rename from src/rbd_recover_tool/metadata_h rename to src/tools/rbd_recover_tool/metadata_h diff --git a/src/rbd_recover_tool/osd_job b/src/tools/rbd_recover_tool/osd_job similarity index 100% rename from src/rbd_recover_tool/osd_job rename to src/tools/rbd_recover_tool/osd_job diff --git a/src/rbd_recover_tool/rbd-recover-tool b/src/tools/rbd_recover_tool/rbd-recover-tool similarity index 100% rename from src/rbd_recover_tool/rbd-recover-tool rename to src/tools/rbd_recover_tool/rbd-recover-tool diff --git a/src/rbd_recover_tool/test_rbd_recover_tool.sh b/src/tools/rbd_recover_tool/test_rbd_recover_tool.sh similarity index 100% rename from src/rbd_recover_tool/test_rbd_recover_tool.sh rename to src/tools/rbd_recover_tool/test_rbd_recover_tool.sh -- 2.47.3