big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
View File

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

6
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/GlobalStateIdContext.java
View File

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