From 822c306da5542b3c04ef1c0aa2cada94050310a3 Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Thu, 26 Mar 2020 18:17:40 +0100
Subject: [PATCH] another one bit the dust

---
 ceph.bootstrap-mds.keyring          |  2 +-
 ceph.bootstrap-mgr.keyring          |  2 +-
 ceph.bootstrap-osd.keyring          |  2 +-
 ceph.bootstrap-rgw.keyring          |  2 +-
 ceph.client.admin.keyring           |  2 +-
 ceph.client.ceph.keyring            |  2 +-
 ceph.conf                           |  1 +
 ceph.mon.keyring                    |  2 +-
 emergency/restore_mons_from_osds.sh | 19 +++++++++++++++++++
 9 files changed, 27 insertions(+), 7 deletions(-)
 create mode 100755 emergency/restore_mons_from_osds.sh

diff --git a/ceph.bootstrap-mds.keyring b/ceph.bootstrap-mds.keyring
index 313ab84..3d7df52 100644
--- a/ceph.bootstrap-mds.keyring
+++ b/ceph.bootstrap-mds.keyring
@@ -1,3 +1,3 @@
 [client.bootstrap-mds]
-	key = AQBEUXJewHz8IhAAwimqlg5sf0JjRZB2QtLjYA==
+	key = AQDOy3xet8pzFxAAn/57Q2bDH8YvsSFQmwVwPA==
 	caps mon = "allow profile bootstrap-mds"
diff --git a/ceph.bootstrap-mgr.keyring b/ceph.bootstrap-mgr.keyring
index 2ab126a..2c62822 100644
--- a/ceph.bootstrap-mgr.keyring
+++ b/ceph.bootstrap-mgr.keyring
@@ -1,3 +1,3 @@
 [client.bootstrap-mgr]
-	key = AQBEUXJeVuH8IhAA5YgFIpggxebNgELWg891hw==
+	key = AQDOy3xe6Rx0FxAAHUiDMQndE+ta14msazLvjQ==
 	caps mon = "allow profile bootstrap-mgr"
diff --git a/ceph.bootstrap-osd.keyring b/ceph.bootstrap-osd.keyring
index 28b4161..09376e5 100644
--- a/ceph.bootstrap-osd.keyring
+++ b/ceph.bootstrap-osd.keyring
@@ -1,3 +1,3 @@
 [client.bootstrap-osd]
-	key = AQBEUXJeHUX9IhAAoCa5bSDNnpKTrkLjldTuwA==
+	key = AQDOy3xeBGx0FxAA9w8aLufA6wJ4o3q2eoVrlg==
 	caps mon = "allow profile bootstrap-osd"
diff --git a/ceph.bootstrap-rgw.keyring b/ceph.bootstrap-rgw.keyring
index 7885ab7..6724e87 100644
--- a/ceph.bootstrap-rgw.keyring
+++ b/ceph.bootstrap-rgw.keyring
@@ -1,3 +1,3 @@
 [client.bootstrap-rgw]
-	key = AQBEUXJeHXD+IhAAZhpROqBnVM/NuaTnAPG9dQ==
+	key = AQDOy3xeJGF1FxAAa34GyVvvtCm0enqnLZgNrw==
 	caps mon = "allow profile bootstrap-rgw"
diff --git a/ceph.client.admin.keyring b/ceph.client.admin.keyring
index 95f5d01..9e46b0f 100644
--- a/ceph.client.admin.keyring
+++ b/ceph.client.admin.keyring
@@ -1,5 +1,5 @@
 [client.admin]
-	key = AQBEUXJe3ez7IhAAjt6d3nLr5GISaHgPV84lKw==
+	key = AQDOy3xeVlZzFxAAM+JvrWp58gxTNIV5q9e7kg==
 	caps mds = "allow *"
 	caps mgr = "allow *"
 	caps mon = "allow *"
diff --git a/ceph.client.ceph.keyring b/ceph.client.ceph.keyring
index 447e66c..68ab2d2 100644
--- a/ceph.client.ceph.keyring
+++ b/ceph.client.ceph.keyring
@@ -1,2 +1,2 @@
 [client.ceph]
-	key = AQA/VHJeomHcIhAAmN1ae+RgZdtqEGshg11cfQ==
+	key = AQDwznxeNFj5IhAAUzp67JaKfgxB8k5WlbQSFQ==
diff --git a/ceph.conf b/ceph.conf
index 30c1cf8..44eccf6 100644
--- a/ceph.conf
+++ b/ceph.conf
@@ -20,6 +20,7 @@ osd pool default min size = 1 # Allow writing two copies in a degraded state.
 osd max backfills = 1
 #osd max backfill scan max = 128
 #50mb / 5mb / 64mb
+mon memory target = 1073741824
 mon_osd_cache_size_min = 134217728 #default 128Mb
 osd_memory_target = 134217728 #128 Mb/ 5 sata ports
 osd_memory_base = 134217728 #128 Mb/ 5 sata ports
diff --git a/ceph.mon.keyring b/ceph.mon.keyring
index fa434b9..6bed335 100644
--- a/ceph.mon.keyring
+++ b/ceph.mon.keyring
@@ -1,3 +1,3 @@
 [mon.]
-key = AQDmUHJeAAAAABAAG+PZK0Vk3qbWra7BWSMwyw==
+key = AQD/yXxeAAAAABAAJhaRs9sKKAvHIg254QBojw==
 caps mon = allow *
diff --git a/emergency/restore_mons_from_osds.sh b/emergency/restore_mons_from_osds.sh
new file mode 100755
index 0000000..05c2c03
--- /dev/null
+++ b/emergency/restore_mons_from_osds.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+#from: https://docs.ceph.com/docs/nautilus/rados/troubleshooting/troubleshooting-mon/?highlight=trouble%20monitor#recovery-using-osds
+
+
+ms=/tmp/mon-store
+mkdir $ms
+hosts="ebin02 ebin01"
+# collect the cluster map from OSDs
+for host in $hosts; do
+  rsync -avz $ms/. $host:$ms.remote
+  rm -rf $ms
+  ssh $host <<EOF
+    for osd in /var/lib/ceph/osd/ceph-*; do
+      ceph-objectstore-tool --data-path \$osd --op update-mon-db --no-mon-config --mon-store-path $ms.remote
+    done
+EOF
+  rsync -avz $host:$ms.remote/. $ms
+done