Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1938,6 +1938,14 @@ public boolean isInStandbyState() {
HAServiceState.OBSERVER == haContext.getState().getServiceState();
}

public boolean isInObserverState() {
if (haContext == null || haContext.getState() == null) {
return false;
}

return HAServiceState.OBSERVER == haContext.getState().getServiceState();
}

/**
* return a list of blocks & their locations on {@code datanode} whose
* total size is {@code size}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ private void doWork() {
// read any more transactions since the last time a roll was
// triggered.
boolean triggeredLogRoll = false;
if (tooLongSinceLastLoad() &&
if (!namesystem.isInObserverState() && tooLongSinceLastLoad() &&
lastRollTriggerTxId < lastLoadedTxnId) {
triggerActiveLogRoll();
triggeredLogRoll = true;
Expand Down