From 899f3fca7f89ab37d20cb1ec06b911ba039c52a3 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 14 Feb 2017 14:38:53 -0800 Subject: [PATCH] osd: Fix ENOSPC crash message text Signed-off-by: David Zafman (cherry picked from commit 50cfe03fcba253c8380b21043ed03879134d6836) --- src/os/bluestore/BlueStore.cc | 2 +- src/os/filestore/FileStore.cc | 2 +- src/os/kstore/KStore.cc | 2 +- src/os/memstore/MemStore.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index dbbeb87cc53..2f7132bcf55 100644 --- 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 062ab614d25..461e1025fb4 100644 --- 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 d4756b12ee5..7d2dd3fd138 100755 --- 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 fd1c1f2ceb3..5ce04f205e4 100644 --- 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"; -- 2.47.3