Repository: hadoop Updated Branches: refs/heads/trunk 50723889c -> 0ef639235
HDFS-13073. Cleanup code in InterQJournalProtocol.proto. Contributed by Bharat Viswanadham. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0ef63923 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0ef63923 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0ef63923 Branch: refs/heads/trunk Commit: 0ef639235b305d684cbe46818613320b3fa62d44 Parents: 5072388 Author: Hanisha Koneru <hanishakon...@apache.org> Authored: Fri Feb 2 16:28:03 2018 -0800 Committer: Hanisha Koneru <hanishakon...@apache.org> Committed: Fri Feb 2 16:28:03 2018 -0800 ---------------------------------------------------------------------- .../protocol/InterQJournalProtocol.java | 4 ++-- ...rQJournalProtocolServerSideTranslatorPB.java | 11 +++++----- .../InterQJournalProtocolTranslatorPB.java | 13 ++++++------ .../qjournal/server/JournalNodeRpcServer.java | 21 ++++++++++---------- .../hdfs/qjournal/server/JournalNodeSyncer.java | 8 ++++---- .../src/main/proto/InterQJournalProtocol.proto | 16 ++------------- 6 files changed, 29 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ef63923/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocol/InterQJournalProtocol.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocol/InterQJournalProtocol.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocol/InterQJournalProtocol.java index 94caeba..f1f7e9c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocol/InterQJournalProtocol.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocol/InterQJournalProtocol.java @@ -21,7 +21,7 @@ package org.apache.hadoop.hdfs.qjournal.protocol; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.qjournal.server.JournalNode; -import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocolProtos.GetEditLogManifestFromJournalResponseProto; +import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetEditLogManifestResponseProto; import org.apache.hadoop.security.KerberosInfo; import java.io.IOException; @@ -47,7 +47,7 @@ public interface InterQJournalProtocol { * segment * @return a list of edit log segments since the given transaction ID. */ - GetEditLogManifestFromJournalResponseProto getEditLogManifestFromJournal( + GetEditLogManifestResponseProto getEditLogManifestFromJournal( String jid, String nameServiceId, long sinceTxId, boolean inProgressOk) throws IOException; http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ef63923/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocolPB/InterQJournalProtocolServerSideTranslatorPB.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocolPB/InterQJournalProtocolServerSideTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocolPB/InterQJournalProtocolServerSideTranslatorPB.java index 15d6387..d4f97d9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocolPB/InterQJournalProtocolServerSideTranslatorPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocolPB/InterQJournalProtocolServerSideTranslatorPB.java @@ -24,8 +24,8 @@ import com.google.protobuf.ServiceException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocol; -import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocolProtos.GetEditLogManifestFromJournalRequestProto; -import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocolProtos.GetEditLogManifestFromJournalResponseProto; +import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetEditLogManifestRequestProto; +import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetEditLogManifestResponseProto; import java.io.IOException; @@ -47,10 +47,9 @@ public class InterQJournalProtocolServerSideTranslatorPB implements } @Override - public GetEditLogManifestFromJournalResponseProto - getEditLogManifestFromJournal(RpcController controller, - GetEditLogManifestFromJournalRequestProto - request) throws ServiceException { + public GetEditLogManifestResponseProto getEditLogManifestFromJournal( + RpcController controller, GetEditLogManifestRequestProto request) + throws ServiceException { try { return impl.getEditLogManifestFromJournal( request.getJid().getIdentifier(), http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ef63923/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocolPB/InterQJournalProtocolTranslatorPB.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocolPB/InterQJournalProtocolTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocolPB/InterQJournalProtocolTranslatorPB.java index cdccfca..37fcb98 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocolPB/InterQJournalProtocolTranslatorPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/protocolPB/InterQJournalProtocolTranslatorPB.java @@ -24,8 +24,8 @@ import com.google.protobuf.ServiceException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocol; -import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocolProtos.GetEditLogManifestFromJournalResponseProto; -import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocolProtos.GetEditLogManifestFromJournalRequestProto; +import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetEditLogManifestRequestProto; +import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetEditLogManifestResponseProto; import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos; import org.apache.hadoop.ipc.ProtobufHelper; import org.apache.hadoop.ipc.ProtocolMetaInterface; @@ -60,13 +60,12 @@ public class InterQJournalProtocolTranslatorPB implements ProtocolMetaInterface, @Override - public GetEditLogManifestFromJournalResponseProto - getEditLogManifestFromJournal(String jid, String nameServiceId, - long sinceTxId, boolean inProgressOk) + public GetEditLogManifestResponseProto getEditLogManifestFromJournal( + String jid, String nameServiceId, long sinceTxId, boolean inProgressOk) throws IOException { try { - GetEditLogManifestFromJournalRequestProto.Builder req; - req = GetEditLogManifestFromJournalRequestProto.newBuilder() + GetEditLogManifestRequestProto.Builder req; + req = GetEditLogManifestRequestProto.newBuilder() .setJid(convertJournalId(jid)) .setSinceTxId(sinceTxId) .setInProgressOk(inProgressOk); http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ef63923/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeRpcServer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeRpcServer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeRpcServer.java index 6cb933b..6e7a388 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeRpcServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeRpcServer.java @@ -17,10 +17,8 @@ */ package org.apache.hadoop.hdfs.qjournal.server; -import java.io.IOException; -import java.net.InetSocketAddress; -import java.net.URL; - +import com.google.common.annotations.VisibleForTesting; +import com.google.protobuf.BlockingService; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; @@ -31,7 +29,6 @@ import org.apache.hadoop.hdfs.HDFSPolicyProvider; import org.apache.hadoop.hdfs.protocolPB.PBHelper; import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocol; import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocolProtos.InterQJournalProtocolService; -import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocolProtos.GetEditLogManifestFromJournalResponseProto; import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocol; import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetEditLogManifestResponseProto; import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetJournalStateResponseProto; @@ -52,8 +49,9 @@ import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.ipc.RPC.Server; import org.apache.hadoop.net.NetUtils; -import com.google.common.annotations.VisibleForTesting; -import com.google.protobuf.BlockingService; +import java.io.IOException; +import java.net.InetSocketAddress; +import java.net.URL; @InterfaceAudience.Private @@ -286,14 +284,15 @@ public class JournalNodeRpcServer implements QJournalProtocol, @SuppressWarnings("deprecation") @Override - public GetEditLogManifestFromJournalResponseProto - getEditLogManifestFromJournal(String jid, String nameServiceId, - long sinceTxId, boolean inProgressOk) + public GetEditLogManifestResponseProto getEditLogManifestFromJournal( + String jid, String nameServiceId, + long sinceTxId, boolean inProgressOk) throws IOException { + RemoteEditLogManifest manifest = jn.getOrCreateJournal(jid, nameServiceId) .getEditLogManifest(sinceTxId, inProgressOk); - return GetEditLogManifestFromJournalResponseProto.newBuilder() + return GetEditLogManifestResponseProto.newBuilder() .setManifest(PBHelper.convert(manifest)) .setHttpPort(jn.getBoundHttpAddress().getPort()) .setFromURL(jn.getHttpServerURI()) http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ef63923/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java index fa47b14..7b3d970 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java @@ -28,7 +28,7 @@ import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.DFSUtilClient; import org.apache.hadoop.hdfs.protocolPB.PBHelper; import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocol; -import org.apache.hadoop.hdfs.qjournal.protocol.InterQJournalProtocolProtos.GetEditLogManifestFromJournalResponseProto; +import org.apache.hadoop.hdfs.qjournal.protocol.QJournalProtocolProtos.GetEditLogManifestResponseProto; import org.apache.hadoop.hdfs.qjournal.protocolPB.InterQJournalProtocolPB; import org.apache.hadoop.hdfs.qjournal.protocolPB.InterQJournalProtocolTranslatorPB; import org.apache.hadoop.hdfs.server.common.Util; @@ -245,7 +245,7 @@ public class JournalNodeSyncer { return; } - GetEditLogManifestFromJournalResponseProto editLogManifest; + GetEditLogManifestResponseProto editLogManifest; try { editLogManifest = jnProxy.getEditLogManifestFromJournal(jid, nameServiceId, 0, false); @@ -318,8 +318,8 @@ public class JournalNodeSyncer { } private void getMissingLogSegments(List<RemoteEditLog> thisJournalEditLogs, - GetEditLogManifestFromJournalResponseProto response, - JournalNodeProxy remoteJNproxy) { + GetEditLogManifestResponseProto response, + JournalNodeProxy remoteJNproxy) { List<RemoteEditLog> otherJournalEditLogs = PBHelper.convert( response.getManifest()).getLogs(); http://git-wip-us.apache.org/repos/asf/hadoop/blob/0ef63923/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/InterQJournalProtocol.proto ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/InterQJournalProtocol.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/InterQJournalProtocol.proto index 8fe9e69..0ecdff1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/InterQJournalProtocol.proto +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/InterQJournalProtocol.proto @@ -31,20 +31,8 @@ package hadoop.hdfs.qjournal; import "HdfsServer.proto"; import "QJournalProtocol.proto"; -message GetEditLogManifestFromJournalRequestProto { - required JournalIdProto jid = 1; - required uint64 sinceTxId = 2; // Transaction ID - optional bool inProgressOk = 3 [default = false]; - optional string nameServiceId = 4; -} - -message GetEditLogManifestFromJournalResponseProto { - required RemoteEditLogManifestProto manifest = 1; - required uint32 httpPort = 2; - optional string fromURL = 3; -} service InterQJournalProtocolService { - rpc getEditLogManifestFromJournal(GetEditLogManifestFromJournalRequestProto) - returns (GetEditLogManifestFromJournalResponseProto); + rpc getEditLogManifestFromJournal(GetEditLogManifestRequestProto) + returns (GetEditLogManifestResponseProto); } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
