Skip to content

Commit 820da96

Browse files
authored
Fix[mqbsl_ledger]: return SUCCESS if ledger is already opened/closed (#954)
Signed-off-by: Evgenii Malygin <[email protected]>
1 parent c2c2d3f commit 820da96

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

src/groups/mqb/mqbsi/mqbsi_ledger.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ const char* LedgerOpResult::toAscii(LedgerOpResult::Enum value)
114114
CASE(SUCCESS)
115115
CASE(UNKNOWN)
116116
CASE(LEDGER_NOT_EXIST)
117-
CASE(LEDGER_ALREADY_OPENED)
118-
CASE(LEDGER_ALREADY_CLOSED)
119117
CASE(LEDGER_UNGRACEFUL_CLOSE)
120118
CASE(LEDGER_READ_ONLY)
121119
CASE(LOG_CREATE_FAILURE)
@@ -151,8 +149,6 @@ bool LedgerOpResult::fromAscii(LedgerOpResult::Enum* out,
151149
CHECKVALUE(SUCCESS)
152150
CHECKVALUE(UNKNOWN)
153151
CHECKVALUE(LEDGER_NOT_EXIST)
154-
CHECKVALUE(LEDGER_ALREADY_OPENED)
155-
CHECKVALUE(LEDGER_ALREADY_CLOSED)
156152
CHECKVALUE(LEDGER_UNGRACEFUL_CLOSE)
157153
CHECKVALUE(LEDGER_READ_ONLY)
158154
CHECKVALUE(LOG_CREATE_FAILURE)

src/groups/mqb/mqbsi/mqbsi_ledger.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ struct LedgerOpResult {
8080
,
8181
e_UNKNOWN = -1,
8282
e_LEDGER_NOT_EXIST = -2,
83-
e_LEDGER_ALREADY_OPENED = -3,
84-
e_LEDGER_ALREADY_CLOSED = -4,
85-
e_LEDGER_UNGRACEFUL_CLOSE = -5
83+
e_LEDGER_UNGRACEFUL_CLOSE = -3
8684

8785
// File specific
8886
// - - - - - - - - - - - - - - - - - - - - - -

src/groups/mqb/mqbsl/mqbsl_ledger.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@ Ledger::~Ledger()
424424
int Ledger::open(int flags)
425425
{
426426
if (d_state == LedgerState::e_OPENED) {
427-
return LedgerOpResult::e_LEDGER_ALREADY_OPENED; // RETURN
427+
BALL_LOG_WARN << "Ledger is already opened";
428+
return LedgerOpResult::e_SUCCESS; // RETURN
428429
}
429430
BSLS_ASSERT_SAFE(d_state == LedgerState::e_CLOSED);
430431

@@ -555,7 +556,8 @@ int Ledger::open(int flags)
555556
int Ledger::close()
556557
{
557558
if (d_state == LedgerState::e_CLOSED) {
558-
return LedgerOpResult::e_LEDGER_ALREADY_CLOSED; // RETURN
559+
BALL_LOG_WARN << "Ledger is already closed";
560+
return LedgerOpResult::e_SUCCESS; // RETURN
559561
}
560562

561563
int rc = LedgerOpResult::e_UNKNOWN;

0 commit comments

Comments
 (0)