HDFS-14494. Move Server logging of StatedId inside receiveRequestState(). Contributed by Shweta Yakkali.

Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org>
This commit is contained in:
Shweta Yakkali 2019-06-10 10:22:16 -07:00 committed by Wei-Chiu Chuang
parent fcfe7a3cc0
commit d6d95d2686
2 changed files with 4 additions and 4 deletions

View File

@ -2676,8 +2676,6 @@ public abstract class Server {
stateId = alignmentContext.receiveRequestState(
header, getMaxIdleTime());
call.setClientStateId(stateId);
LOG.trace("Client State ID= {} and Server State ID= {}",
call.getClientStateId(), alignmentContext.getLastSeenStateId());
}
} catch (IOException ioe) {
throw new RpcServerException("Processing RPC request caught ", ioe);

View File

@ -124,9 +124,11 @@ class GlobalStateIdContext implements AlignmentContext {
@Override
public long receiveRequestState(RpcRequestHeaderProto header,
long clientWaitTime) throws RetriableException {
long serverStateId =
namesystem.getFSImage().getCorrectLastAppliedOrWrittenTxId();
long serverStateId = getLastSeenStateId();
long clientStateId = header.getStateId();
FSNamesystem.LOG.trace("Client State ID= {} and Server State ID= {}",
clientStateId, serverStateId);
if (clientStateId > serverStateId &&
HAServiceState.ACTIVE.equals(namesystem.getState())) {
FSNamesystem.LOG.warn("The client stateId: {} is greater than "