You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2021/02/07 15:22:39 UTC
[ozone] branch master updated: HDDS-4799. Add @Override to methods
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 8585fba HDDS-4799. Add @Override to methods
8585fba is described below
commit 8585fba44a6ffe22fa2c65cc651acec6b6872e5e
Author: lamberken <xi...@cmss.chinamobile.com>
AuthorDate: Sun Feb 7 16:20:14 2021 +0100
HDDS-4799. Add @Override to methods
Closes apache/ozone#1901.
---
.../org/apache/hadoop/hdds/scm/XceiverClientGrpc.java | 1 +
.../apache/hadoop/hdds/scm/XceiverClientManager.java | 4 ++++
.../org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java | 7 +++++++
.../hadoop/hdds/scm/net/NetworkTopologyImpl.java | 18 ++++++++++++++++++
.../java/org/apache/hadoop/hdds/scm/net/NodeImpl.java | 12 ++++++++++++
.../org/apache/hadoop/hdds/utils/BackgroundTask.java | 1 +
.../java/org/apache/hadoop/hdds/conf/StorageUnit.java | 1 +
.../org/apache/hadoop/hdds/conf/TimeDurationUtil.java | 14 ++++++++++++++
.../ozone/container/common/impl/ContainerDataYaml.java | 2 ++
.../container/common/impl/StorageLocationReport.java | 6 ++++++
.../common/statemachine/EndpointStateMachine.java | 4 ++++
.../container/common/utils/ReferenceCountedDB.java | 1 +
.../ozone/container/keyvalue/KeyValueContainer.java | 8 ++++++++
.../container/keyvalue/KeyValueContainerData.java | 3 +++
.../container/keyvalue/impl/BlockManagerImpl.java | 4 ++++
.../metadata/DatanodeSchemaOneDBDefinition.java | 1 +
.../ozone/protocol/commands/CommandForDatanode.java | 1 +
.../hadoop/ozone/protocol/commands/SCMCommand.java | 1 +
.../ozone/container/keyvalue/ChunkLayoutTestInfo.java | 2 ++
hadoop-hdds/docs/content/interface/Cli.md | 2 +-
...ontainerLocationProtocolClientSideTranslatorPB.java | 3 +++
.../x509/certificate/authority/DefaultApprover.java | 1 +
.../x509/certificate/client/DNCertificateClient.java | 1 +
.../x509/certificate/client/OMCertificateClient.java | 2 ++
.../apache/hadoop/hdds/utils/db/BatchOperation.java | 1 +
.../apache/hadoop/hdds/utils/db/ByteArrayKeyValue.java | 2 ++
.../org/apache/hadoop/hdds/utils/db/TypedTable.java | 1 +
.../apache/hadoop/hdds/utils/db/cache/EpochEntry.java | 1 +
.../hadoop/hdds/utils/db/cache/FullTableCache.java | 4 ++++
.../hadoop/hdds/utils/db/cache/PartialTableCache.java | 4 ++++
.../apache/hadoop/hdds/scm/block/BlockManagerImpl.java | 2 ++
.../hadoop/hdds/scm/container/SCMContainerManager.java | 8 ++++++++
.../hdds/scm/pipeline/RatisPipelineProvider.java | 1 +
.../hadoop/hdds/scm/pipeline/SCMPipelineManager.java | 3 +++
.../hadoop/hdds/scm/safemode/SCMSafeModeManager.java | 1 +
.../hdds/scm/server/StorageContainerManager.java | 11 +++++++++++
.../scm/server/StorageContainerManagerStarter.java | 3 +++
.../hadoop/hdds/scm/container/MockNodeManager.java | 2 ++
.../scm/server/TestStorageContainerManagerStarter.java | 3 +++
.../hadoop/hdds/scm/cli/ContainerOperationClient.java | 3 +++
.../apache/hadoop/hdds/scm/cli/TopologySubcommand.java | 1 +
.../org/apache/hadoop/ozone/client/rpc/RpcClient.java | 1 +
.../org/apache/hadoop/ozone/om/ha/OMProxyInfo.java | 1 +
.../OzoneManagerProtocolClientSideTranslatorPB.java | 3 +++
.../org/apache/hadoop/ozone/MiniOzoneChaosCluster.java | 6 ++++++
.../java/org/apache/hadoop/ozone/failure/Failures.java | 4 ++++
.../ozone/loadgenerators/RandomLoadGenerator.java | 1 +
.../ozone/loadgenerators/ReadOnlyLoadGenerator.java | 1 +
.../org/apache/hadoop/ozone/MiniOzoneClusterImpl.java | 2 ++
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 6 ++++++
.../apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 3 +++
.../java/org/apache/hadoop/ozone/om/OzoneManager.java | 1 +
.../apache/hadoop/ozone/om/OzoneManagerStarter.java | 2 ++
.../ozone/om/response/key/OMKeysDeleteResponse.java | 1 +
.../ozone/om/response/key/OMOpenKeysDeleteRequest.java | 1 +
.../security/OzoneDelegationTokenSecretManager.java | 1 +
.../ozone/security/acl/OzoneNativeAuthorizer.java | 1 +
.../hadoop/ozone/om/TestOzoneManagerStarter.java | 2 ++
.../hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java | 2 ++
.../apache/hadoop/fs/ozone/BasicOzoneFileSystem.java | 1 +
.../fs/ozone/BasicRootedOzoneClientAdapterImpl.java | 2 ++
.../hadoop/fs/ozone/BasicRootedOzoneFileSystem.java | 2 ++
.../java/org/apache/hadoop/fs/ozone/O3fsDtFetcher.java | 3 +++
.../java/org/apache/hadoop/fs/ozone/OzoneFsShell.java | 1 +
.../org/hadoop/ozone/recon/codegen/SqlDbUtils.java | 1 +
.../hadoop/ozone/recon/ReconRestServletModule.java | 4 ++++
.../hadoop/ozone/recon/fsck/ContainerHealthTask.java | 1 +
.../ozone/recon/scm/ReconDatanodeProtocolServer.java | 1 +
.../recon/scm/ReconStorageContainerManagerFacade.java | 3 +++
.../apache/hadoop/ozone/s3/AWSSignatureProcessor.java | 4 ++++
.../org/apache/hadoop/ozone/s3/util/RangeHeader.java | 2 +-
.../ozone/audit/parser/handler/LoadCommandHandler.java | 1 +
.../audit/parser/handler/QueryCommandHandler.java | 1 +
.../audit/parser/handler/TemplateCommandHandler.java | 1 +
.../main/java/org/apache/hadoop/ozone/shell/Shell.java | 2 +-
75 files changed, 217 insertions(+), 3 deletions(-)
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
index fb8ba52..8703011 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java
@@ -559,6 +559,7 @@ public class XceiverClientGrpc extends XceiverClientSpi {
return null;
}
+ @Override
public long getReplicatedMinCommitIndex() {
return 0;
}
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientManager.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientManager.java
index eaf0503..31728c6 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientManager.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientManager.java
@@ -139,6 +139,7 @@ public class XceiverClientManager implements Closeable, XceiverClientFactory {
* @return XceiverClientSpi connected to a container
* @throws IOException if a XceiverClientSpi cannot be acquired
*/
+ @Override
public XceiverClientSpi acquireClient(Pipeline pipeline)
throws IOException {
return acquireClient(pipeline, false);
@@ -154,6 +155,7 @@ public class XceiverClientManager implements Closeable, XceiverClientFactory {
* @return XceiverClientSpi connected to a container
* @throws IOException if a XceiverClientSpi cannot be acquired
*/
+ @Override
public XceiverClientSpi acquireClientForReadData(Pipeline pipeline)
throws IOException {
return acquireClient(pipeline, true);
@@ -179,6 +181,7 @@ public class XceiverClientManager implements Closeable, XceiverClientFactory {
* @param client client to release
* @param invalidateClient if true, invalidates the client in cache
*/
+ @Override
public void releaseClient(XceiverClientSpi client, boolean invalidateClient) {
releaseClient(client, invalidateClient, false);
}
@@ -189,6 +192,7 @@ public class XceiverClientManager implements Closeable, XceiverClientFactory {
* @param client client to release
* @param invalidateClient if true, invalidates the client in cache
*/
+ @Override
public void releaseClientForReadData(XceiverClientSpi client,
boolean invalidateClient) {
releaseClient(client, invalidateClient, true);
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java
index c567b5d..23bdd32 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java
@@ -39,6 +39,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
protected static class Factory implements InnerNode.Factory<InnerNodeImpl> {
protected Factory() {}
+ @Override
public InnerNodeImpl newInnerNode(String name, String location,
InnerNode parent, int level, int cost) {
return new InnerNodeImpl(name, location, parent, level, cost);
@@ -80,6 +81,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
* relative level. If level is 1, means node itself. If level is 2, means its
* direct children, and so on.
**/
+ @Override
public int getNumOfNodes(int level) {
Preconditions.checkArgument(level > 0);
int count = 0;
@@ -126,6 +128,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
* @param node node to be added
* @return true if the node is added, false if is only updated
*/
+ @Override
public boolean add(Node node) {
if (!isAncestor(node)) {
throw new IllegalArgumentException(node.getNetworkName()
@@ -162,6 +165,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
* Remove node <i>node</i> from the subtree of this node.
* @param node node to be deleted
*/
+ @Override
public void remove(Node node) {
if (!isAncestor(node)) {
throw new IllegalArgumentException(node.getNetworkName()
@@ -206,6 +210,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
*
* @return null if the node is not found
*/
+ @Override
public Node getNode(String loc) {
if (loc == null) {
return null;
@@ -249,6 +254,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
* @param leafIndex an indexed leaf of the node
* @return the leaf node corresponding to the given index.
*/
+ @Override
public Node getLeaf(int leafIndex) {
Preconditions.checkArgument(leafIndex >= 0);
// children are leaves
@@ -314,6 +320,7 @@ public class InnerNodeImpl extends NodeImpl implements InnerNode {
* means picking the 3th available node, which is n5.
*
*/
+ @Override
public Node getLeaf(int leafIndex, List<String> excludedScopes,
Collection<Node> excludedNodes, int ancestorGen) {
Preconditions.checkArgument(leafIndex >= 0 && ancestorGen >= 0);
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java
index acbb64f..aac5ad1 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java
@@ -86,6 +86,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* @exception IllegalArgumentException if add a node to a leave or node to be
* added is not a leaf
*/
+ @Override
public void add(Node node) {
Preconditions.checkArgument(node != null, "node cannot be null");
if (node instanceof InnerNode) {
@@ -120,6 +121,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* existing datanode is removed from the system.
* @param node node to be removed; cannot be null
*/
+ @Override
public void remove(Node node) {
Preconditions.checkArgument(node != null, "node cannot be null");
if (node instanceof InnerNode) {
@@ -143,6 +145,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* @param node a node
* @return true if <i>node</i> is already in the tree; false otherwise
*/
+ @Override
public boolean contains(Node node) {
Preconditions.checkArgument(node != null, "node cannot be null");
netlock.readLock().lock();
@@ -164,6 +167,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* Compare the specified ancestor generation of each node for equality.
* @return true if their specified generation ancestor are equal
*/
+ @Override
public boolean isSameAncestor(Node node1, Node node2, int ancestorGen) {
if (node1 == null || node2 == null || ancestorGen <= 0) {
return false;
@@ -180,6 +184,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* Compare the direct parent of each node for equality.
* @return true if their parent are the same
*/
+ @Override
public boolean isSameParent(Node node1, Node node2) {
if (node1 == null || node2 == null) {
return false;
@@ -201,6 +206,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* @param ancestorGen the ancestor generation
* @return the ancestor. If no ancestor is found, then null is returned.
*/
+ @Override
public Node getAncestor(Node node, int ancestorGen) {
if (node == null) {
return null;
@@ -219,6 +225,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* @param loc a path string representing a node, can be leaf or inner node
* @return a reference to the node, null if the node is not in the tree
*/
+ @Override
public Node getNode(String loc) {
loc = NetUtils.normalize(loc);
netlock.readLock().lock();
@@ -239,6 +246,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* @return the number of leaf nodes for InnerNode, 1 for leaf node, 0 if node
* doesn't exist
*/
+ @Override
public int getNumOfLeafNode(String loc) {
netlock.readLock().lock();
try {
@@ -256,6 +264,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* Return the max level of this tree, start from 1 for ROOT. For example,
* topology like "/rack/node" has the max level '3'.
*/
+ @Override
public int getMaxLevel() {
return maxLevel;
}
@@ -265,6 +274,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* @param level topology level, start from 1, which means ROOT
* @return the number of nodes on the level
*/
+ @Override
public int getNumOfNodes(int level) {
Preconditions.checkArgument(level > 0 && level <= maxLevel,
"Invalid level");
@@ -283,6 +293,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* ones in <i>scope</i>; otherwise, choose one from <i>scope</i>.
* @return the chosen node
*/
+ @Override
public Node chooseRandom(String scope) {
if (scope == null) {
scope = ROOT;
@@ -305,6 +316,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* starts with ~
* @return the chosen node
*/
+ @Override
public Node chooseRandom(String scope, List<String> excludedScopes) {
return chooseRandom(scope, excludedScopes, null, null,
ANCESTOR_GENERATION_DEFAULT);
@@ -322,6 +334,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
*
* @return the chosen node
*/
+ @Override
public Node chooseRandom(String scope, Collection<Node> excludedNodes) {
if (scope == null) {
scope = ROOT;
@@ -355,6 +368,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
*
* @return the chosen node
*/
+ @Override
public Node chooseRandom(String scope, Collection<Node> excludedNodes,
int ancestorGen) {
if (scope == null) {
@@ -388,6 +402,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* excludedNodes if affinityNode is null
* @return the chosen node
*/
+ @Override
public Node chooseRandom(String scope, List<String> excludedScopes,
Collection<Node> excludedNodes, Node affinityNode, int ancestorGen) {
if (scope == null) {
@@ -457,6 +472,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* from subtree /dc1. LeafIndex 1, so we pick the 2nd available node n4.
*
*/
+ @Override
public Node getNode(int leafIndex, String scope, List<String> excludedScopes,
Collection<Node> excludedNodes, Node affinityNode, int ancestorGen) {
Preconditions.checkArgument(leafIndex >= 0);
@@ -582,6 +598,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* are the same or {@link Integer#MAX_VALUE} if node1 or node2 do not belong
* to the cluster
*/
+ @Override
public int getDistanceCost(Node node1, Node node2) {
if ((node1 != null && node2 != null && node1.equals(node2)) ||
(node1 == null && node2 == null)) {
@@ -637,6 +654,7 @@ public class NetworkTopologyImpl implements NetworkTopology{
* @param nodes Available replicas with the requested data
* @param activeLen Number of active nodes at the front of the array
*/
+ @Override
public List<? extends Node> sortByDistanceCost(Node reader,
List<? extends Node> nodes, int activeLen) {
/** Sort weights for the nodes array */
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeImpl.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeImpl.java
index 53b05ea..3a926fa 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeImpl.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NodeImpl.java
@@ -77,6 +77,7 @@ public class NodeImpl implements Node {
/**
* @return this node's name
*/
+ @Override
public String getNetworkName() {
return name;
}
@@ -85,6 +86,7 @@ public class NodeImpl implements Node {
* Set this node's name, can be hostname or Ipaddress.
* @param networkName it's network name
*/
+ @Override
public void setNetworkName(String networkName) {
this.name = networkName;
this.path = getPath();
@@ -93,6 +95,7 @@ public class NodeImpl implements Node {
/**
* @return this node's network location
*/
+ @Override
public String getNetworkLocation() {
return location;
}
@@ -111,6 +114,7 @@ public class NodeImpl implements Node {
* @return this node's full path in network topology. It's the concatenation
* of location and name.
*/
+ @Override
public String getNetworkFullPath() {
return path;
}
@@ -118,6 +122,7 @@ public class NodeImpl implements Node {
/**
* @return this node's parent
*/
+ @Override
public InnerNode getParent() {
return parent;
}
@@ -126,6 +131,7 @@ public class NodeImpl implements Node {
* @return this node's ancestor, generation 0 is itself, generation 1 is
* node's parent, and so on.
*/
+ @Override
public Node getAncestor(int generation) {
Preconditions.checkArgument(generation >= 0);
Node current = this;
@@ -141,6 +147,7 @@ public class NodeImpl implements Node {
*
* @param parent the parent
*/
+ @Override
public void setParent(InnerNode parent) {
this.parent = parent;
}
@@ -149,6 +156,7 @@ public class NodeImpl implements Node {
* @return this node's level in the tree.
* E.g. the root of a tree returns 0 and its children return 1
*/
+ @Override
public int getLevel() {
return this.level;
}
@@ -158,6 +166,7 @@ public class NodeImpl implements Node {
*
* @param level the level
*/
+ @Override
public void setLevel(int level) {
this.level = level;
}
@@ -168,11 +177,13 @@ public class NodeImpl implements Node {
* datacenter is 5.
* Be default the cost of leaf datanode is 0, all other inner node is 1.
*/
+ @Override
public int getCost() {
return this.cost;
}
/** @return the leaf nodes number under this node. */
+ @Override
public int getNumOfLeaves() {
return 1;
}
@@ -183,6 +194,7 @@ public class NodeImpl implements Node {
* @param node a node
* @return true if this node is an ancestor of <i>node</i>
*/
+ @Override
public boolean isAncestor(Node node) {
return this.getNetworkFullPath().equals(PATH_SEPARATOR_STR) ||
node.getNetworkLocation().startsWith(this.getNetworkFullPath()) ||
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/BackgroundTask.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/BackgroundTask.java
index d506210..e985671 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/BackgroundTask.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/BackgroundTask.java
@@ -24,6 +24,7 @@ import java.util.concurrent.Callable;
*/
public interface BackgroundTask extends Callable<BackgroundTaskResult> {
+ @Override
BackgroundTaskResult call() throws Exception;
int getPriority();
diff --git a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/StorageUnit.java b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/StorageUnit.java
index 6678aa4..0d14fab 100644
--- a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/StorageUnit.java
+++ b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/StorageUnit.java
@@ -522,6 +522,7 @@ public enum StorageUnit {
public abstract double fromBytes(double value);
+ @Override
public String toString() {
return getLongName();
}
diff --git a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/TimeDurationUtil.java b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/TimeDurationUtil.java
index 2bbdecf..12c4953 100644
--- a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/TimeDurationUtil.java
+++ b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/TimeDurationUtil.java
@@ -65,64 +65,78 @@ public final class TimeDurationUtil {
enum ParsedTimeDuration {
NS {
+ @Override
TimeUnit unit() {
return TimeUnit.NANOSECONDS;
}
+ @Override
String suffix() {
return "ns";
}
},
US {
+ @Override
TimeUnit unit() {
return TimeUnit.MICROSECONDS;
}
+ @Override
String suffix() {
return "us";
}
},
MS {
+ @Override
TimeUnit unit() {
return TimeUnit.MILLISECONDS;
}
+ @Override
String suffix() {
return "ms";
}
},
S {
+ @Override
TimeUnit unit() {
return TimeUnit.SECONDS;
}
+ @Override
String suffix() {
return "s";
}
},
M {
+ @Override
TimeUnit unit() {
return TimeUnit.MINUTES;
}
+ @Override
String suffix() {
return "m";
}
},
H {
+ @Override
TimeUnit unit() {
return TimeUnit.HOURS;
}
+ @Override
String suffix() {
return "h";
}
},
D {
+ @Override
TimeUnit unit() {
return TimeUnit.DAYS;
}
+ @Override
String suffix() {
return "d";
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java
index 757d7e8..244750a 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java
@@ -245,6 +245,7 @@ public final class ContainerDataYaml {
}
private class ConstructKeyValueContainerData extends AbstractConstruct {
+ @Override
public Object construct(Node node) {
MappingNode mnode = (MappingNode) node;
Map<Object, Object> nodes = constructMapping(mnode);
@@ -289,6 +290,7 @@ public final class ContainerDataYaml {
// number if it fits in integer, otherwise returns long. So, slightly
// modified the code to return long in all cases.
private class ConstructLong extends AbstractConstruct {
+ @Override
public Object construct(Node node) {
String value = constructScalar((ScalarNode) node).toString()
.replaceAll("_", "");
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/StorageLocationReport.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/StorageLocationReport.java
index 2ad7f0d..8599b49 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/StorageLocationReport.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/StorageLocationReport.java
@@ -55,26 +55,32 @@ public final class StorageLocationReport implements
this.storageLocation = storageLocation;
}
+ @Override
public String getId() {
return id;
}
+ @Override
public boolean isFailed() {
return failed;
}
+ @Override
public long getCapacity() {
return capacity;
}
+ @Override
public long getScmUsed() {
return scmUsed;
}
+ @Override
public long getRemaining() {
return remaining;
}
+ @Override
public String getStorageLocation() {
return storageLocation;
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java
index 13f953f..31d7bbc 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java
@@ -115,6 +115,7 @@ public class EndpointStateMachine
*
* @return - getState.
*/
+ @Override
public EndPointStates getState() {
return state;
}
@@ -171,6 +172,7 @@ public class EndpointStateMachine
*
* @return int
*/
+ @Override
public long getMissedCount() {
return this.missedCount.get();
}
@@ -208,6 +210,7 @@ public class EndpointStateMachine
*
* @return - String
*/
+ @Override
public String toString() {
return address.toString();
}
@@ -327,6 +330,7 @@ public class EndpointStateMachine
}
}
+ @Override
public long getLastSuccessfulHeartbeat() {
return lastSuccessfulHeartbeat == null ?
0 :
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/utils/ReferenceCountedDB.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/utils/ReferenceCountedDB.java
index 87e4bff..5fe61a8 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/utils/ReferenceCountedDB.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/utils/ReferenceCountedDB.java
@@ -91,6 +91,7 @@ public class ReferenceCountedDB implements Closeable {
return store;
}
+ @Override
public void close() {
decrementReference();
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
index 53d6162..5079811 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
@@ -553,6 +553,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
/**
* Acquire read lock.
*/
+ @Override
public void readLock() {
this.lock.readLock().lock();
@@ -561,6 +562,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
/**
* Release read lock.
*/
+ @Override
public void readUnlock() {
this.lock.readLock().unlock();
}
@@ -568,6 +570,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
/**
* Check if the current thread holds read lock.
*/
+ @Override
public boolean hasReadLock() {
return this.lock.readLock().tryLock();
}
@@ -575,6 +578,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
/**
* Acquire write lock.
*/
+ @Override
public void writeLock() {
// TODO: The lock for KeyValueContainer object should not be exposed
// publicly.
@@ -584,6 +588,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
/**
* Release write lock.
*/
+ @Override
public void writeUnlock() {
this.lock.writeLock().unlock();
@@ -592,6 +597,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
/**
* Check if the current thread holds write lock.
*/
+ @Override
public boolean hasWriteLock() {
return this.lock.writeLock().isHeldByCurrentThread();
}
@@ -706,6 +712,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
.getContainerID() + OzoneConsts.DN_CONTAINER_DB);
}
+ @Override
public boolean scanMetaData() {
long containerId = containerData.getContainerID();
KeyValueContainerCheck checker =
@@ -720,6 +727,7 @@ public class KeyValueContainer implements Container<KeyValueContainerData> {
|| containerData.getState() == ContainerDataProto.State.QUASI_CLOSED;
}
+ @Override
public boolean scanData(DataTransferThrottler throttler, Canceler canceler) {
if (!shouldScanData()) {
throw new IllegalStateException("The checksum verification can not be" +
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
index 5c20e6e..9f93e50 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
@@ -168,6 +168,7 @@ public class KeyValueContainerData extends ContainerData {
* Returns the path to base dir of the container.
* @return Path to base dir
*/
+ @Override
public String getContainerPath() {
return new File(metadataPath).getParent();
}
@@ -175,6 +176,7 @@ public class KeyValueContainerData extends ContainerData {
/**
* Returns the blockCommitSequenceId.
*/
+ @Override
public long getBlockCommitSequenceId() {
return blockCommitSequenceId;
}
@@ -248,6 +250,7 @@ public class KeyValueContainerData extends ContainerData {
*
* @return Protocol Buffer Message
*/
+ @Override
public ContainerDataProto getProtoBufMessage() {
ContainerDataProto.Builder builder = ContainerDataProto.newBuilder();
builder.setContainerID(this.getContainerID());
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java
index 474092e..5980b92 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java
@@ -78,6 +78,7 @@ public class BlockManagerImpl implements BlockManager {
* @return length of the block.
* @throws IOException
*/
+ @Override
public long putBlock(Container container, BlockData data) throws IOException {
return putBlock(container, data, true);
}
@@ -91,6 +92,7 @@ public class BlockManagerImpl implements BlockManager {
* @return length of the block.
* @throws IOException
*/
+ @Override
public long putBlock(Container container, BlockData data,
boolean incrKeyCount) throws IOException {
Preconditions.checkNotNull(data, "BlockData cannot be null for put " +
@@ -236,6 +238,7 @@ public class BlockManagerImpl implements BlockManager {
* @param blockID - ID of the block.
* @throws StorageContainerException
*/
+ @Override
public void deleteBlock(Container container, BlockID blockID) throws
IOException {
Preconditions.checkNotNull(blockID, "block ID cannot be null.");
@@ -318,6 +321,7 @@ public class BlockManagerImpl implements BlockManager {
/**
* Shutdown KeyValueContainerManager.
*/
+ @Override
public void shutdown() {
BlockUtils.shutdownCache(ContainerCache.getInstance(config));
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaOneDBDefinition.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaOneDBDefinition.java
index 7d5e053..a0d500e 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaOneDBDefinition.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaOneDBDefinition.java
@@ -89,6 +89,7 @@ public class DatanodeSchemaOneDBDefinition
return DELETED_BLOCKS;
}
+ @Override
public DBColumnFamilyDefinition[] getColumnFamilies() {
return new DBColumnFamilyDefinition[] {getBlockDataColumnFamily(),
getMetadataColumnFamily(), getDeletedBlocksColumnFamily() };
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/CommandForDatanode.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/CommandForDatanode.java
index 66bf623..893aa89 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/CommandForDatanode.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/CommandForDatanode.java
@@ -46,6 +46,7 @@ public class CommandForDatanode<T extends GeneratedMessage> implements
return command;
}
+ @Override
public long getId() {
return command.getId();
}
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/SCMCommand.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/SCMCommand.java
index 3c4e05b..e1eae72 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/SCMCommand.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocol/commands/SCMCommand.java
@@ -55,6 +55,7 @@ public abstract class SCMCommand<T extends GeneratedMessage> implements
* Gets the commandId of this object.
* @return uuid.
*/
+ @Override
public long getId() {
return id;
}
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ChunkLayoutTestInfo.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ChunkLayoutTestInfo.java
index edd3368..55f1f60 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ChunkLayoutTestInfo.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/ChunkLayoutTestInfo.java
@@ -62,6 +62,7 @@ public enum ChunkLayoutTestInfo {
},
FILE_PER_CHUNK {
+ @Override
public ChunkManager createChunkManager(boolean sync, BlockManager manager) {
return new FilePerChunkStrategy(sync, manager);
}
@@ -78,6 +79,7 @@ public enum ChunkLayoutTestInfo {
},
FILE_PER_BLOCK {
+ @Override
public ChunkManager createChunkManager(boolean sync, BlockManager manager) {
return new FilePerBlockStrategy(sync);
}
diff --git a/hadoop-hdds/docs/content/interface/Cli.md b/hadoop-hdds/docs/content/interface/Cli.md
index d65d573..cbdc499 100644
--- a/hadoop-hdds/docs/content/interface/Cli.md
+++ b/hadoop-hdds/docs/content/interface/Cli.md
@@ -146,7 +146,7 @@ Command examples:
```shell
$ ozone sh bucket create /vol1/bucket1
-```shell
+```
```shell
$ ozone sh bucket info /vol1/bucket1
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
index 4d48ad3..a050b3c 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
@@ -169,6 +169,7 @@ public final class StorageContainerLocationProtocolClientSideTranslatorPB
response.getContainerWithPipeline());
}
+ @Override
public ContainerInfo getContainer(long containerID) throws IOException {
Preconditions.checkState(containerID >= 0,
"Container ID cannot be negative");
@@ -188,6 +189,7 @@ public final class StorageContainerLocationProtocolClientSideTranslatorPB
/**
* {@inheritDoc}
*/
+ @Override
public ContainerWithPipeline getContainerWithPipeline(long containerID)
throws IOException {
Preconditions.checkState(containerID >= 0,
@@ -210,6 +212,7 @@ public final class StorageContainerLocationProtocolClientSideTranslatorPB
/**
* {@inheritDoc}
*/
+ @Override
public List<ContainerWithPipeline> getContainerWithPipelineBatch(
List<Long> containerIDs) throws IOException {
for (Long containerID: containerIDs) {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
index 0098fa5..7ea28b6 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
@@ -80,6 +80,7 @@ public class DefaultApprover extends BaseApprover {
* @throws OperatorCreationException - on Error.
*/
@SuppressWarnings("ParameterNumber")
+ @Override
public X509CertificateHolder sign(
SecurityConfig config,
PrivateKey caPrivate,
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DNCertificateClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DNCertificateClient.java
index e95a4a7..40c5b0a 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DNCertificateClient.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DNCertificateClient.java
@@ -60,6 +60,7 @@ public class DNCertificateClient extends DefaultCertificateClient {
.setDigitalSignature(true);
}
+ @Override
public Logger getLogger() {
return LOG;
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java
index cb3ce75..2e1b204 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/OMCertificateClient.java
@@ -50,6 +50,7 @@ public class OMCertificateClient extends DefaultCertificateClient {
super(securityConfig, LOG, null, COMPONENT_NAME);
}
+ @Override
protected InitResponse handleCase(InitCase init) throws
CertificateException {
switch (init) {
@@ -119,6 +120,7 @@ public class OMCertificateClient extends DefaultCertificateClient {
}
+ @Override
public Logger getLogger() {
return LOG;
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/BatchOperation.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/BatchOperation.java
index 8ca5d18..849f226 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/BatchOperation.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/BatchOperation.java
@@ -23,5 +23,6 @@ package org.apache.hadoop.hdds.utils.db;
*/
public interface BatchOperation extends AutoCloseable {
+ @Override
void close();
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/ByteArrayKeyValue.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/ByteArrayKeyValue.java
index 7c60291..48db1a2 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/ByteArrayKeyValue.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/ByteArrayKeyValue.java
@@ -48,6 +48,7 @@ public final class ByteArrayKeyValue implements KeyValue<byte[], byte[]> {
*
* @return byte[]
*/
+ @Override
public byte[] getKey() {
byte[] result = new byte[key.length];
System.arraycopy(key, 0, result, 0, key.length);
@@ -59,6 +60,7 @@ public final class ByteArrayKeyValue implements KeyValue<byte[], byte[]> {
*
* @return byte[]
*/
+ @Override
public byte[] getValue() {
byte[] result = new byte[value.length];
System.arraycopy(value, 0, result, 0, value.length);
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TypedTable.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TypedTable.java
index b7eb096..0f26306 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TypedTable.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TypedTable.java
@@ -308,6 +308,7 @@ public class TypedTable<KEY, VALUE> implements Table<KEY, VALUE> {
return cache.get(cacheKey);
}
+ @Override
public Iterator<Map.Entry<CacheKey<KEY>, CacheValue<VALUE>>> cacheIterator() {
return cache.iterator();
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/EpochEntry.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/EpochEntry.java
index 00ffc1d..d87e90d 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/EpochEntry.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/EpochEntry.java
@@ -61,6 +61,7 @@ public class EpochEntry<CACHEKEY> implements Comparable<CACHEKEY> {
return Objects.hash(epoch, cachekey);
}
+ @Override
public int compareTo(Object o) {
if(this.epoch == ((EpochEntry<?>)o).epoch) {
return 0;
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/FullTableCache.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/FullTableCache.java
index 2754b59..9378393 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/FullTableCache.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/FullTableCache.java
@@ -110,6 +110,7 @@ public class FullTableCache<CACHEKEY extends CacheKey,
}
}
+ @Override
public void cleanup(List<Long> epochs) {
executorService.execute(() -> evictCache(epochs));
}
@@ -125,6 +126,7 @@ public class FullTableCache<CACHEKEY extends CacheKey,
}
@VisibleForTesting
+ @Override
public void evictCache(List<Long> epochs) {
EpochEntry<CACHEKEY> currentEntry;
CACHEKEY cachekey;
@@ -165,6 +167,7 @@ public class FullTableCache<CACHEKEY extends CacheKey,
}
}
+ @Override
public CacheResult<CACHEVALUE> lookup(CACHEKEY cachekey) {
CACHEVALUE cachevalue = cache.get(cachekey);
@@ -183,6 +186,7 @@ public class FullTableCache<CACHEKEY extends CacheKey,
}
@VisibleForTesting
+ @Override
public Set<EpochEntry<CACHEKEY>> getEpochEntrySet() {
return epochEntries;
}
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/PartialTableCache.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/PartialTableCache.java
index 0bf03c5..8db9e0c 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/PartialTableCache.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/cache/PartialTableCache.java
@@ -95,6 +95,7 @@ public class PartialTableCache<CACHEKEY extends CacheKey,
epochEntries.add(new EpochEntry<>(value.getEpoch(), cacheKey));
}
+ @Override
public void cleanup(List<Long> epochs) {
executorService.execute(() -> evictCache(epochs));
}
@@ -110,6 +111,7 @@ public class PartialTableCache<CACHEKEY extends CacheKey,
}
@VisibleForTesting
+ @Override
public void evictCache(List<Long> epochs) {
EpochEntry<CACHEKEY> currentEntry;
CACHEKEY cachekey;
@@ -147,6 +149,7 @@ public class PartialTableCache<CACHEKEY extends CacheKey,
}
}
+ @Override
public CacheResult<CACHEVALUE> lookup(CACHEKEY cachekey) {
CACHEVALUE cachevalue = cache.get(cachekey);
@@ -163,6 +166,7 @@ public class PartialTableCache<CACHEKEY extends CacheKey,
}
}
+ @Override
@VisibleForTesting
public Set<EpochEntry<CACHEKEY>> getEpochEntrySet() {
return epochEntries;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
index 657a1f7..2c4592d 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/BlockManagerImpl.java
@@ -125,6 +125,7 @@ public class BlockManagerImpl implements BlockManager, BlockmanagerMXBean {
*
* @throws IOException
*/
+ @Override
public void start() throws IOException {
this.blockDeletingService.start();
}
@@ -134,6 +135,7 @@ public class BlockManagerImpl implements BlockManager, BlockmanagerMXBean {
*
* @throws IOException
*/
+ @Override
public void stop() throws IOException {
this.blockDeletingService.shutdown();
this.close();
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
index f8ffc02..4d96465 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/SCMContainerManager.java
@@ -198,6 +198,7 @@ public class SCMContainerManager implements ContainerManager {
* @param state {@link LifeCycleState}
* @return Count
*/
+ @Override
public Integer getContainerCountByState(LifeCycleState state) {
return containerStateManager.getContainerCountByState(state);
}
@@ -393,6 +394,7 @@ public class SCMContainerManager implements ContainerManager {
* transaction id for the container.
* @throws IOException
*/
+ @Override
public void updateDeleteTransactionId(Map<Long, Long> deleteTransactionMap)
throws IOException {
@@ -443,12 +445,14 @@ public class SCMContainerManager implements ContainerManager {
* @param pipeline - Pipeline to which the container should belong.
* @return ContainerInfo, null if there is no match found.
*/
+ @Override
public ContainerInfo getMatchingContainer(final long sizeRequired,
String owner, Pipeline pipeline) {
return getMatchingContainer(sizeRequired, owner, pipeline,
Collections.emptySet());
}
+ @Override
@SuppressWarnings("squid:S2445")
public ContainerInfo getMatchingContainer(final long sizeRequired,
String owner, Pipeline pipeline,
@@ -559,6 +563,7 @@ public class SCMContainerManager implements ContainerManager {
* @param containerID
* @return Set<DatanodeDetails>
*/
+ @Override
public Set<ContainerReplica> getContainerReplicas(
final ContainerID containerID) throws ContainerNotFoundException {
return containerStateManager.getContainerReplicas(containerID);
@@ -570,6 +575,7 @@ public class SCMContainerManager implements ContainerManager {
* @param containerID
* @param replica
*/
+ @Override
public void updateContainerReplica(final ContainerID containerID,
final ContainerReplica replica) throws ContainerNotFoundException {
containerStateManager.updateContainerReplica(containerID, replica);
@@ -582,6 +588,7 @@ public class SCMContainerManager implements ContainerManager {
* @param replica
* @return True of dataNode is removed successfully else false.
*/
+ @Override
public void removeContainerReplica(final ContainerID containerID,
final ContainerReplica replica)
throws ContainerNotFoundException, ContainerReplicaNotFoundException {
@@ -613,6 +620,7 @@ public class SCMContainerManager implements ContainerManager {
}
}
+ @Override
public void notifyContainerReportProcessing(boolean isFullReport,
boolean success) {
if (isFullReport) {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
index cd468bc..45aafb0 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/RatisPipelineProvider.java
@@ -190,6 +190,7 @@ public class RatisPipelineProvider extends PipelineProvider {
* @param pipeline - Pipeline to be destroyed
* @throws IOException
*/
+ @Override
public void close(Pipeline pipeline) {
final ClosePipelineCommand closeCommand =
new ClosePipelineCommand(pipeline.getId());
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/SCMPipelineManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/SCMPipelineManager.java
index aefa413..b188b42 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/SCMPipelineManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/SCMPipelineManager.java
@@ -361,6 +361,7 @@ public class SCMPipelineManager implements PipelineManager {
}
}
+ @Override
public List<Pipeline> getPipelines(ReplicationType type,
Pipeline.PipelineState state) {
lock.readLock().lock();
@@ -727,6 +728,7 @@ public class SCMPipelineManager implements PipelineManager {
* @param pipeline
* @return healthy volume count
*/
+ @Override
public int minHealthyVolumeNum(Pipeline pipeline) {
return nodeManager.minHealthyVolumeNum(pipeline.getNodes());
}
@@ -737,6 +739,7 @@ public class SCMPipelineManager implements PipelineManager {
* @param pipeline
* @return healthy volume count
*/
+ @Override
public int minPipelineLimit(Pipeline pipeline) {
return nodeManager.minPipelineLimit(pipeline.getNodes());
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SCMSafeModeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SCMSafeModeManager.java
index 6744194..39cf341 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SCMSafeModeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/SCMSafeModeManager.java
@@ -266,6 +266,7 @@ public class SCMSafeModeManager implements SafeModeManager {
emitSafeModeStatus();
}
+ @Override
public boolean getInSafeMode() {
if (!isSafeModeEnabled) {
return false;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 3cb070c..6e214c2 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -771,6 +771,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
*
* @return Address where datanode are communicating.
*/
+ @Override
public InetSocketAddress getDatanodeRpcAddress() {
return getDatanodeProtocolServer().getDatanodeRpcAddress();
}
@@ -784,6 +785,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
/**
* Start service.
*/
+ @Override
public void start() throws IOException {
if (LOG.isInfoEnabled()) {
LOG.info(buildRpcServerStartMessage(
@@ -826,6 +828,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
/**
* Stop service.
*/
+ @Override
public void stop() {
try {
@@ -936,6 +939,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
/**
* Wait until service has completed shutdown.
*/
+ @Override
public void join() {
try {
getBlockProtocolServer().join();
@@ -975,6 +979,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
* Returns SCM container manager.
*/
@VisibleForTesting
+ @Override
public ContainerManager getContainerManager() {
return containerManager;
}
@@ -985,6 +990,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
* @return - Node Manager
*/
@VisibleForTesting
+ @Override
public NodeManager getScmNodeManager() {
return scmNodeManager;
}
@@ -995,11 +1001,13 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
* @return - Pipeline Manager
*/
@VisibleForTesting
+ @Override
public PipelineManager getPipelineManager() {
return pipelineManager;
}
@VisibleForTesting
+ @Override
public BlockManager getScmBlockManager() {
return scmBlockManager;
}
@@ -1010,6 +1018,7 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
}
@VisibleForTesting
+ @Override
public ReplicationManager getReplicationManager() {
return replicationManager;
}
@@ -1162,10 +1171,12 @@ public final class StorageContainerManager extends ServiceRuntimeInfoImpl
return this.pipelineChoosePolicy;
}
+ @Override
public String getScmId() {
return getScmStorageConfig().getScmId();
}
+ @Override
public String getClusterId() {
return getScmStorageConfig().getClusterID();
}
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java
index afa3732..f30bfe3 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManagerStarter.java
@@ -140,17 +140,20 @@ public class StorageContainerManagerStarter extends GenericCli {
*/
static class SCMStarterHelper implements SCMStarterInterface {
+ @Override
public void start(OzoneConfiguration conf) throws Exception {
StorageContainerManager stm = StorageContainerManager.createSCM(conf);
stm.start();
stm.join();
}
+ @Override
public boolean init(OzoneConfiguration conf, String clusterId)
throws IOException{
return StorageContainerManager.scmInit(conf, clusterId);
}
+ @Override
public String generateClusterId() {
return StorageInfo.newClusterID();
}
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
index 2253820..ddd4aef 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/MockNodeManager.java
@@ -299,6 +299,7 @@ public class MockNodeManager implements NodeManager {
* @param datanodeDetails The datanode to set the new state for
* @param newState The new operational state for the node
*/
+ @Override
public void setNodeOperationalState(DatanodeDetails datanodeDetails,
HddsProtos.NodeOperationalState newState) throws NodeNotFoundException {
}
@@ -308,6 +309,7 @@ public class MockNodeManager implements NodeManager {
* @param datanodeDetails The datanode to set the new state for
* @param newState The new operational state for the node
*/
+ @Override
public void setNodeOperationalState(DatanodeDetails datanodeDetails,
HddsProtos.NodeOperationalState newState, long opStateExpiryEpocSec)
throws NodeNotFoundException {
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestStorageContainerManagerStarter.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestStorageContainerManagerStarter.java
index dc983b8..4916190 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestStorageContainerManagerStarter.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestStorageContainerManagerStarter.java
@@ -145,6 +145,7 @@ public class TestStorageContainerManagerStarter {
private boolean generateCalled = false;
private String clusterId = null;
+ @Override
public void start(OzoneConfiguration conf) throws Exception {
if (throwOnStart) {
throw new Exception("Simulated error on start");
@@ -152,6 +153,7 @@ public class TestStorageContainerManagerStarter {
startCalled = true;
}
+ @Override
public boolean init(OzoneConfiguration conf, String cid)
throws IOException {
if (throwOnInit) {
@@ -162,6 +164,7 @@ public class TestStorageContainerManagerStarter {
return initStatus;
}
+ @Override
public String generateClusterId() {
generateCalled = true;
return "static-cluster-id";
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
index f92ee7d..4a193e5 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
@@ -497,10 +497,12 @@ public class ContainerOperationClient implements ScmClient {
* @return Returns true if SCM is in safe mode else returns false.
* @throws IOException
*/
+ @Override
public boolean inSafeMode() throws IOException {
return storageContainerLocationClient.inSafeMode();
}
+ @Override
public Map<String, Pair<Boolean, String>> getSafeModeRuleStatuses()
throws IOException {
return storageContainerLocationClient.getSafeModeRuleStatuses();
@@ -512,6 +514,7 @@ public class ContainerOperationClient implements ScmClient {
* @return returns true if operation is successful.
* @throws IOException
*/
+ @Override
public boolean forceExitSafeMode() throws IOException {
return storageContainerLocationClient.forceExitSafeMode();
}
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/TopologySubcommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/TopologySubcommand.java
index bb442e0..e6888b8 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/TopologySubcommand.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/TopologySubcommand.java
@@ -85,6 +85,7 @@ public class TopologySubcommand extends ScmSubcommand
}
}
+ @Override
public Class<?> getParentType() {
return OzoneAdmin.class;
}
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
index 48aacb6..d23560c 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -1287,6 +1287,7 @@ public class RpcClient implements ClientProtocol {
return (dtService != null) ? dtService.toString() : null;
}
+ @Override
@VisibleForTesting
public OzoneManagerProtocol getOzoneManagerClient() {
return ozoneManagerClient;
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMProxyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMProxyInfo.java
index cbfe4a9..e166b6d 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMProxyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/OMProxyInfo.java
@@ -61,6 +61,7 @@ public class OMProxyInfo {
}
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder()
.append("nodeId=")
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
index 26dc34b..6d10e42 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
@@ -784,6 +784,7 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
* @param bucket - Name of the bucket.
* @throws IOException
*/
+ @Override
public void deleteBucket(String volume, String bucket) throws IOException {
DeleteBucketRequest.Builder req = DeleteBucketRequest.newBuilder();
req.setVolumeName(volume);
@@ -1043,6 +1044,7 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
return response;
}
+ @Override
public List<ServiceInfo> getServiceList() throws IOException {
ServiceListRequest req = ServiceListRequest.newBuilder().build();
@@ -1180,6 +1182,7 @@ public final class OzoneManagerProtocolClientSideTranslatorPB
* @return OzoneFileStatus for the key.
* @throws IOException
*/
+ @Override
public OzoneFileStatus getFileStatus(OmKeyArgs args) throws IOException {
KeyArgs keyArgs = KeyArgs.newBuilder()
.setVolumeName(args.getVolumeName())
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
index 4401737..802277c 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/MiniOzoneChaosCluster.java
@@ -114,6 +114,7 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
failureManager.start(initialDelay, period, timeUnit);
}
+ @Override
public void shutdown() {
try {
failureManager.stop();
@@ -166,6 +167,7 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
* @param val number of datanodes
* @return MiniOzoneChaosCluster.Builder
*/
+ @Override
public Builder setNumDatanodes(int val) {
super.setNumDatanodes(val);
return this;
@@ -196,6 +198,7 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
return this;
}
+ @Override
protected void initializeConfiguration() throws IOException {
super.initializeConfiguration();
@@ -253,6 +256,7 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
*
* @return MiniOzoneCluster.Builder
*/
+ @Override
public Builder setNumDataVolumes(int val) {
numDataVolumes = val;
return this;
@@ -317,11 +321,13 @@ public class MiniOzoneChaosCluster extends MiniOzoneHAClusterImpl {
return oms;
}
+ @Override
public void shutdownOzoneManager(OzoneManager om) {
super.shutdownOzoneManager(om);
failedOmSet.add(om);
}
+ @Override
public void restartOzoneManager(OzoneManager om, boolean waitForOM)
throws IOException, TimeoutException, InterruptedException {
super.restartOzoneManager(om, waitForOM);
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/failure/Failures.java b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/failure/Failures.java
index 604fcff..678720b 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/failure/Failures.java
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/failure/Failures.java
@@ -72,6 +72,7 @@ public abstract class Failures {
* Restart Ozone Manager to induce failure.
*/
public static class OzoneManagerRestartFailure extends OzoneFailures {
+ @Override
public void fail(MiniOzoneChaosCluster cluster) {
boolean failureMode = FailureManager.isFastRestart();
Set<OzoneManager> oms = cluster.omToFail();
@@ -91,6 +92,7 @@ public abstract class Failures {
* Start/Stop Ozone Manager to induce failure.
*/
public static class OzoneManagerStartStopFailure extends OzoneFailures {
+ @Override
public void fail(MiniOzoneChaosCluster cluster) {
// Get the number of OzoneManager to fail in the cluster.
boolean shouldStop = cluster.shouldStop();
@@ -124,6 +126,7 @@ public abstract class Failures {
* Restart Datanodes to induce failure.
*/
public static class DatanodeRestartFailure extends DatanodeFailures {
+ @Override
public void fail(MiniOzoneChaosCluster cluster) {
boolean failureMode = FailureManager.isFastRestart();
Set<DatanodeDetails> dns = cluster.dnToFail();
@@ -141,6 +144,7 @@ public abstract class Failures {
* Start/Stop Datanodes to induce failure.
*/
public static class DatanodeStartStopFailure extends DatanodeFailures {
+ @Override
public void fail(MiniOzoneChaosCluster cluster) {
// Get the number of datanodes to fail in the cluster.
Set<DatanodeDetails> dns = cluster.dnToFail();
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/RandomLoadGenerator.java b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/RandomLoadGenerator.java
index 354d93a..e6d70cc 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/RandomLoadGenerator.java
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/RandomLoadGenerator.java
@@ -52,6 +52,7 @@ public class RandomLoadGenerator extends LoadGenerator {
ozoneBucket.deleteKey(keyName);
}
+ @Override
public void initialize() {
// Nothing to do here
}
diff --git a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/ReadOnlyLoadGenerator.java b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/ReadOnlyLoadGenerator.java
index e8e6257..758d83a 100644
--- a/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/ReadOnlyLoadGenerator.java
+++ b/hadoop-ozone/fault-injection-test/mini-chaos-tests/src/test/java/org/apache/hadoop/ozone/loadgenerators/ReadOnlyLoadGenerator.java
@@ -43,6 +43,7 @@ public class ReadOnlyLoadGenerator extends LoadGenerator {
}
+ @Override
public void initialize() throws Exception {
for (int index = 0; index < NUM_KEYS; index++) {
ByteBuffer buffer = dataBuffer.getBuffer(index);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
index e9876eb..c37552f 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/MiniOzoneClusterImpl.java
@@ -156,10 +156,12 @@ public class MiniOzoneClusterImpl implements MiniOzoneCluster {
this.reconServer = reconServer;
}
+ @Override
public OzoneConfiguration getConf() {
return conf;
}
+ @Override
public String getServiceId() {
// Non-HA cluster doesn't have OM Service Id.
return null;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index 962ffc3..7cc61ec 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -1748,6 +1748,7 @@ public class KeyManagerImpl implements KeyManager {
* @throws IOException if there is error in the db
* invalid arguments
*/
+ @Override
public OzoneFileStatus getFileStatus(OmKeyArgs args) throws IOException {
Preconditions.checkNotNull(args, "Key args can not be null");
return getFileStatus(args, null);
@@ -1765,6 +1766,7 @@ public class KeyManagerImpl implements KeyManager {
* @throws IOException if there is error in the db
* invalid arguments
*/
+ @Override
public OzoneFileStatus getFileStatus(OmKeyArgs args, String clientAddress)
throws IOException {
Preconditions.checkNotNull(args, "Key args can not be null");
@@ -1846,6 +1848,7 @@ public class KeyManagerImpl implements KeyManager {
* @throws IOException if there is error in the db
* invalid arguments
*/
+ @Override
public void createDirectory(OmKeyArgs args) throws IOException {
Preconditions.checkNotNull(args, "Key args can not be null");
String volumeName = args.getVolumeName();
@@ -1994,6 +1997,7 @@ public class KeyManagerImpl implements KeyManager {
* Refresh the key block location information by get latest info from SCM.
* @param key
*/
+ @Override
public void refresh(OmKeyInfo key) throws IOException {
Preconditions.checkNotNull(key, "Key info can not be null");
refreshPipeline(Arrays.asList(key));
@@ -2048,6 +2052,7 @@ public class KeyManagerImpl implements KeyManager {
* @param numEntries Number of entries to list from the start key
* @return list of file status
*/
+ @Override
public List<OzoneFileStatus> listStatus(OmKeyArgs args, boolean recursive,
String startKey, long numEntries)
throws IOException {
@@ -2067,6 +2072,7 @@ public class KeyManagerImpl implements KeyManager {
* pipeline by distance between client and datanode.
* @return list of file status
*/
+ @Override
public List<OzoneFileStatus> listStatus(OmKeyArgs args, boolean recursive,
String startKey, long numEntries, String clientAddress)
throws IOException {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
index a144c7b..b1e7860 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
@@ -208,6 +208,7 @@ public class OmMetadataManagerImpl implements OMMetadataManager {
return userTable;
}
+ @Override
public Table<OzoneTokenIdentifier, Long> getDelegationTokenTable() {
return dTokenTable;
}
@@ -731,11 +732,13 @@ public class OmMetadataManagerImpl implements OMMetadataManager {
return result;
}
+ @Override
public Iterator<Map.Entry<CacheKey<String>, CacheValue<OmBucketInfo>>>
getBucketIterator(){
return bucketTable.cacheIterator();
}
+ @Override
public TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
getKeyIterator(){
return keyTable.iterator();
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 945bb27..5b71fbc 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -635,6 +635,7 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
* Class which schedule saving metrics to a file.
*/
private class ScheduleOMMetricsWriteTask extends TimerTask {
+ @Override
public void run() {
saveOmMetrics();
}
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java
index 6dc4aea..99dc3e6 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerStarter.java
@@ -119,6 +119,7 @@ public class OzoneManagerStarter extends GenericCli {
*/
static class OMStarterHelper implements OMStarterInterface{
+ @Override
public void start(OzoneConfiguration conf) throws IOException,
AuthenticationException {
OzoneManager om = OzoneManager.createOm(conf);
@@ -126,6 +127,7 @@ public class OzoneManagerStarter extends GenericCli {
om.join();
}
+ @Override
public boolean init(OzoneConfiguration conf) throws IOException,
AuthenticationException {
return OzoneManager.omInit(conf);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java
index 8a6a4a2..0a8a6b3 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMKeysDeleteResponse.java
@@ -58,6 +58,7 @@ public class OMKeysDeleteResponse extends AbstractOMKeyDeleteResponse {
super(omResponse);
}
+ @Override
public void checkAndUpdateDB(OMMetadataManager omMetadataManager,
BatchOperation batchOperation) throws IOException {
if (getOMResponse().getStatus() == OK ||
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteRequest.java
index 0748500..7b867bb 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMOpenKeysDeleteRequest.java
@@ -57,6 +57,7 @@ public class OMOpenKeysDeleteRequest extends OMKeyRequest {
super(omRequest);
}
+ @Override
public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
long trxnLogIndex, OzoneManagerDoubleBufferHelper omDoubleBufferHelper) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java
index 542d636..6e9bd1a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java
@@ -342,6 +342,7 @@ public class OzoneDelegationTokenSecretManager
* @throws InvalidToken for invalid token
* @throws AccessControlException if the user isn't allowed to cancel
*/
+ @Override
public OzoneTokenIdentifier cancelToken(Token<OzoneTokenIdentifier> token,
String canceller) throws IOException {
OzoneTokenIdentifier id = OzoneTokenIdentifier.readProtoBuf(
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneNativeAuthorizer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneNativeAuthorizer.java
index aebefdc..2521b76 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneNativeAuthorizer.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneNativeAuthorizer.java
@@ -72,6 +72,7 @@ public class OzoneNativeAuthorizer implements IAccessAuthorizer {
* @param context Context object encapsulating all user related information.
* @return true if user has access else false.
*/
+ @Override
public boolean checkAccess(IOzoneObj ozObject, RequestContext context)
throws OMException {
Objects.requireNonNull(ozObject);
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerStarter.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerStarter.java
index 595713b..06767fe 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerStarter.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerStarter.java
@@ -139,6 +139,7 @@ public class TestOzoneManagerStarter {
private boolean throwOnStart = false;
private boolean throwOnInit = false;
+ @Override
public void start(OzoneConfiguration conf) throws IOException,
AuthenticationException {
startCalled = true;
@@ -147,6 +148,7 @@ public class TestOzoneManagerStarter {
}
}
+ @Override
public boolean init(OzoneConfiguration conf) throws IOException,
AuthenticationException {
initCalled = true;
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
index f9bee54..6784dea 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneClientAdapterImpl.java
@@ -291,6 +291,7 @@ public class BasicOzoneClientAdapterImpl implements OzoneClientAdapter {
}
}
+ @Override
public FileStatusAdapter getFileStatus(String key, URI uri,
Path qualifiedPath, String userName)
throws IOException {
@@ -315,6 +316,7 @@ public class BasicOzoneClientAdapterImpl implements OzoneClientAdapter {
return new IteratorAdapter(bucket.listKeys(pathKey));
}
+ @Override
public List<FileStatusAdapter> listStatus(String keyName, boolean recursive,
String startKey, long numEntries, URI uri,
Path workingDir, String username) throws IOException {
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
index ad453a4..ffe3aef 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicOzoneFileSystem.java
@@ -409,6 +409,7 @@ public class BasicOzoneFileSystem extends FileSystem {
* Intercept rename to trash calls from TrashPolicyDefault.
*/
@Deprecated
+ @Override
protected void rename(final Path src, final Path dst,
final Rename... options) throws IOException {
boolean hasMoveToTrash = false;
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
index 2bf6ee3..74f5557 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
@@ -531,6 +531,7 @@ public class BasicRootedOzoneClientAdapterImpl
}
}
+ @Override
public FileStatusAdapter getFileStatus(String path, URI uri,
Path qualifiedPath, String userName) throws IOException {
incrementCounter(Statistic.OBJECTS_QUERY, 1);
@@ -706,6 +707,7 @@ public class BasicRootedOzoneClientAdapterImpl
* @return A list of FileStatusAdapter.
* @throws IOException Bucket exception or FileNotFoundException.
*/
+ @Override
public List<FileStatusAdapter> listStatus(String pathStr, boolean recursive,
String startPath, long numEntries, URI uri,
Path workingDir, String username) throws IOException {
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
index 3f45c3f..55edd00 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneFileSystem.java
@@ -389,6 +389,7 @@ public class BasicRootedOzoneFileSystem extends FileSystem {
* Intercept rename to trash calls from TrashPolicyDefault.
*/
@Deprecated
+ @Override
protected void rename(final Path src, final Path dst,
final Options.Rename... options) throws IOException {
boolean hasMoveToTrash = false;
@@ -694,6 +695,7 @@ public class BasicRootedOzoneFileSystem extends FileSystem {
* @param allUsers return trashRoots of all users if true, used by emptier
* @return trash roots
*/
+ @Override
public Collection<FileStatus> getTrashRoots(boolean allUsers) {
// Since get all trash roots for one or more users requires listing all
// volumes and buckets, we will let adapter impl handle it.
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/O3fsDtFetcher.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/O3fsDtFetcher.java
index 5ab3a00..769c466 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/O3fsDtFetcher.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/O3fsDtFetcher.java
@@ -50,10 +50,12 @@ public class O3fsDtFetcher implements DtFetcher {
/**
* Returns the service name for O3fs, which is also a valid URL prefix.
*/
+ @Override
public Text getServiceName() {
return new Text(SERVICE_NAME);
}
+ @Override
public boolean isTokenRequired() {
return UserGroupInformation.isSecurityEnabled();
}
@@ -66,6 +68,7 @@ public class O3fsDtFetcher implements DtFetcher {
* @param url - the URL to which the request is sent
* @return a Token, or null if fetch fails.
*/
+ @Override
public Token<?> addDelegationTokens(Configuration conf, Credentials creds,
String renewer, String url) throws Exception {
if (!url.startsWith(getServiceName().toString())) {
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFsShell.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFsShell.java
index 3169ecd..3d2887b 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFsShell.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFsShell.java
@@ -50,6 +50,7 @@ public class OzoneFsShell extends FsShell {
super(conf);
}
+ @Override
protected void registerCommands(CommandFactory factory) {
// TODO: DFSAdmin subclasses FsShell so need to protect the command
// registration. This class should morph into a base class for
diff --git a/hadoop-ozone/recon-codegen/src/main/java/org/hadoop/ozone/recon/codegen/SqlDbUtils.java b/hadoop-ozone/recon-codegen/src/main/java/org/hadoop/ozone/recon/codegen/SqlDbUtils.java
index 2db54e6..55069ce 100644
--- a/hadoop-ozone/recon-codegen/src/main/java/org/hadoop/ozone/recon/codegen/SqlDbUtils.java
+++ b/hadoop-ozone/recon-codegen/src/main/java/org/hadoop/ozone/recon/codegen/SqlDbUtils.java
@@ -74,6 +74,7 @@ public final class SqlDbUtils {
*/
public static OutputStream disableDerbyLogFile(){
return new OutputStream() {
+ @Override
public void write(int b) throws IOException {
// Ignore all log messages
}
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconRestServletModule.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconRestServletModule.java
index 584cb89..184c51a 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconRestServletModule.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconRestServletModule.java
@@ -109,6 +109,8 @@ public abstract class ReconRestServletModule extends ServletModule {
class GuiceResourceConfig extends ResourceConfig {
GuiceResourceConfig() {
register(new ContainerLifecycleListener() {
+
+ @Override
public void onStartup(Container container) {
ServletContainer servletContainer = (ServletContainer) container;
InjectionManager injectionManager = container.getApplicationHandler()
@@ -123,9 +125,11 @@ class GuiceResourceConfig extends ResourceConfig {
guiceBridge.bridgeGuiceInjector(injector);
}
+ @Override
public void onReload(Container container) {
}
+ @Override
public void onShutdown(Container container) {
}
});
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/fsck/ContainerHealthTask.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/fsck/ContainerHealthTask.java
index a4ca664..80764aa 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/fsck/ContainerHealthTask.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/fsck/ContainerHealthTask.java
@@ -68,6 +68,7 @@ public class ContainerHealthTask extends ReconScmTask {
interval = reconTaskConfig.getMissingContainerTaskInterval().toMillis();
}
+ @Override
public synchronized void run() {
try {
while (canRun()) {
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconDatanodeProtocolServer.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconDatanodeProtocolServer.java
index a9cde11..f1a8f01 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconDatanodeProtocolServer.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconDatanodeProtocolServer.java
@@ -71,6 +71,7 @@ public class ReconDatanodeProtocolServer extends SCMDatanodeProtocolServer
return ReconPolicyProvider.getInstance();
}
+ @Override
protected Class<ReconDatanodeProtocolPB> getProtocolClass() {
return ReconDatanodeProtocolPB.class;
}
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
index 04c02ec..d45c45d 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconStorageContainerManagerFacade.java
@@ -200,6 +200,7 @@ public class ReconStorageContainerManagerFacade
/**
* Start the Recon SCM subsystems.
*/
+ @Override
public void start() {
if (LOG.isInfoEnabled()) {
LOG.info(buildRpcServerStartMessage(
@@ -214,6 +215,7 @@ public class ReconStorageContainerManagerFacade
/**
* Wait until service has completed shutdown.
*/
+ @Override
public void join() {
try {
getDatanodeProtocolServer().join();
@@ -226,6 +228,7 @@ public class ReconStorageContainerManagerFacade
/**
* Stop the Recon SCM subsystems.
*/
+ @Override
public void stop() {
getDatanodeProtocolServer().stop();
reconScmTasks.forEach(ReconScmTask::stop);
diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/AWSSignatureProcessor.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/AWSSignatureProcessor.java
index 38e6641..2bcecb5 100644
--- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/AWSSignatureProcessor.java
+++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/AWSSignatureProcessor.java
@@ -346,16 +346,19 @@ public class AWSSignatureProcessor implements SignatureProcessor {
return Hex.encode(md.digest()).toLowerCase();
}
+ @Override
public String getAwsAccessId() {
return (v4Header != null ? v4Header.getAccessKeyID() :
v2Header != null ? v2Header.getAccessKeyID() : "");
}
+ @Override
public String getSignature() {
return (v4Header != null ? v4Header.getSignature() :
v2Header != null ? v2Header.getSignature() : "");
}
+ @Override
public String getStringToSign() throws Exception {
return stringToSign;
}
@@ -376,6 +379,7 @@ public class AWSSignatureProcessor implements SignatureProcessor {
this.v2Header = v2Header;
}
+ @Override
public Exception getException() {
return this.exception;
}
diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/RangeHeader.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/RangeHeader.java
index a57a0f6..226f902 100644
--- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/RangeHeader.java
+++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/RangeHeader.java
@@ -80,7 +80,7 @@ public class RangeHeader {
return inValidRange;
}
-
+ @Override
public String toString() {
return "startOffset - [" + startOffset + "]" + ", endOffset - ["
+ endOffset + "]" + ", readFull - [" + readFull + "]"
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/LoadCommandHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/LoadCommandHandler.java
index 6c4316d..46d4d78 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/LoadCommandHandler.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/LoadCommandHandler.java
@@ -44,6 +44,7 @@ public class LoadCommandHandler implements Callable<Void> {
@ParentCommand
private AuditParser auditParser;
+ @Override
public Void call() throws Exception {
if (DatabaseHelper.setup(auditParser.getDatabase(), logs)) {
System.out.println(logs + " has been loaded successfully");
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/QueryCommandHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/QueryCommandHandler.java
index 46c4b30..93d6d4c 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/QueryCommandHandler.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/QueryCommandHandler.java
@@ -47,6 +47,7 @@ public class QueryCommandHandler implements Callable<Void> {
@ParentCommand
private AuditParser auditParser;
+ @Override
public Void call() throws Exception {
try {
System.out.println(
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/TemplateCommandHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/TemplateCommandHandler.java
index c8e4eed..5d58559 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/TemplateCommandHandler.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/handler/TemplateCommandHandler.java
@@ -50,6 +50,7 @@ public class TemplateCommandHandler implements Callable<Void> {
@ParentCommand
private AuditParser auditParser;
+ @Override
public Void call() throws Exception {
try {
if(DatabaseHelper.validateTemplate(template)) {
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java
index 6fd0aa3..ef75943 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java
@@ -31,7 +31,7 @@ public abstract class Shell extends GenericCli {
public static final String OZONE_URI_DESCRIPTION = "Ozone URI could start "
+ "with o3:// or without prefix. URI may contain the host/serviceId "
- + " and port of the OM server. Both are optional. "
+ + "and port of the OM server. Both are optional. "
+ "If they are not specified it will be identified from "
+ "the config files.";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org