osd: Fix ENOSPC crash message text

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

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index dbbeb87cc535d612284245c8966ea9d761ace1cc..2f7132bcf552f3447c5ad5de2bbebb08ec7cf2a6 100644 (file)
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -7334,7 +7334,7 @@ void BlueStore::_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 bluestore, misconfigured cluster";
 
        if (r == -ENOTEMPTY) {
          msg = "ENOTEMPTY suggests garbage data in osd data dir";

diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
index 062ab614d25d5bfbae617ee4b46c48cf78ba11f5..461e1025fb460cd4858cbcefb380c201446df3cb 100644 (file)
--- a/src/os/filestore/FileStore.cc
+++ b/src/os/filestore/FileStore.cc
@@ -2997,7 +2997,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 d4756b12ee58cf09b63474e377f7acc0292ffd2c..7d2dd3fd138e67eb9ddafddd683c3b434d42a3ab 100755 (executable)
--- a/src/os/kstore/KStore.cc
+++ b/src/os/kstore/KStore.cc
@@ -2507,7 +2507,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 fd1c1f2ceb359c9e3c1e548e5da5ab2ac92989fa..5ce04f205e4733bb57af87977a31c43f83547b0b 100644 (file)
--- a/src/os/memstore/MemStore.cc
+++ b/src/os/memstore/MemStore.cc
@@ -1037,7 +1037,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";