From: David Zafman <dzafman@redhat.com>
Date: Tue, 14 Feb 2017 22:38:53 +0000 (-0800)
Subject: osd: Fix ENOSPC crash message text
X-Git-Tag: v10.2.10~114^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=21e2a0337092d57f3e23d282b02b99146ed50a63;p=ceph.git

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 c47b0d0d2eae..6f3af26fb2de 100644
--- 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 a2250d8bfdf2..0bdee1f109f5 100644
--- 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 eb06f18592d2..ec647d3b580f 100644
--- 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";