osd: Fix ENOSPC crash message text

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 50cfe03fcba253c8380b21043ed03879134d6836)

Conflicts:
	src/os/bluestore/BlueStore.cc: leave bluestore code as is,
	  bluestore users should use Kraken or Luminous

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index c47b0d0d2eae4b4b46f35456db197b76a81c21bd..6f3af26fb2dea6b930766d06ebf8e470b8df85cf 100644 (file)
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -2895,7 +2895,7 @@ void FileStore::_do_transaction(
        } else if (r == -ENOSPC) {
          // For now, if we hit _any_ ENOSPC, crash, before we do any damage
          // by partially applying transactions.
-         msg = "ENOSPC handling not implemented";
+         msg = "ENOSPC from disk filesystem, misconfigured cluster";
        } else if (r == -ENOTEMPTY) {
          msg = "ENOTEMPTY suggests garbage data in osd data dir";
        } else if (r == -EPERM) {

diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc
index a2250d8bfdf217894b71fb35e3c65610d97b5acc..0bdee1f109f565f9d3ec0b55e113e1a7b4450ce8 100644 (file)
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@ -2774,7 +2774,7 @@ void KStore::_txc_add_transaction(TransContext *txc, Transaction *t)
        if (r == -ENOSPC)
          // For now, if we hit _any_ ENOSPC, crash, before we do any damage
          // by partially applying transactions.
-         msg = "ENOSPC handling not implemented";
+         msg = "ENOSPC from key value store, misconfigured cluster";
 
        if (r == -ENOTEMPTY) {
          msg = "ENOTEMPTY suggests garbage data in osd data dir";

diff --git a/src/os/memstore/MemStore.cc b/src/os/memstore/MemStore.cc
index eb06f18592d279be32fc8388f0b185bf4e636cc5..ec647d3b580f37b3cc2951d4f539b00f1134c664 100644 (file)
--- a/src/os/memstore/MemStore.cc
+++ b/src/os/memstore/MemStore.cc
@@ -985,7 +985,7 @@ void MemStore::_do_transaction(Transaction& t)
        if (r == -ENOSPC)
          // For now, if we hit _any_ ENOSPC, crash, before we do any damage
          // by partially applying transactions.
-         msg = "ENOSPC handling not implemented";
+         msg = "ENOSPC from MemStore, misconfigured cluster or insufficient memory";
 
        if (r == -ENOTEMPTY) {
          msg = "ENOTEMPTY suggests garbage data in osd data dir";