From 7ebd8f55b765c95ca1ecd918287e33161b40de6e Mon Sep 17 00:00:00 2001 From: Ivan Zlenko <241953+ivanzlenko@users.noreply.github.com> Date: Tue, 18 Feb 2025 17:15:21 +0500 Subject: [PATCH] HDDS-12364. Add missing Override annotation Enable PMD rule to verify that we can't override method without Override annotation. --- dev-support/pmd/pmd-ruleset.xml | 2 ++ .../ozone/client/io/BlockInputStreamFactoryImpl.java | 1 + .../client/io/ECBlockInputStreamFactoryImpl.java | 1 + .../org/apache/hadoop/hdds/scm/net/InnerNode.java | 2 ++ .../hadoop/ozone/common/ChecksumByteBuffer.java | 5 +++++ .../org/apache/hadoop/ozone/common/ChunkBuffer.java | 1 + .../hadoop/ozone/lock/BootstrapStateHandler.java | 3 +++ .../hadoop/ozone/upgrade/BasicUpgradeFinalizer.java | 2 ++ .../upgrade/DefaultUpgradeFinalizationExecutor.java | 1 + .../container/common/utils/ReferenceCountedDB.java | 1 + .../ozone/container/common/volume/DbVolume.java | 1 + .../ozone/container/common/volume/HddsVolume.java | 1 + .../container/common/volume/MetadataVolume.java | 1 + .../keyvalue/KeyValueContainerMetadataInspector.java | 1 + .../ozone/container/keyvalue/KeyValueHandler.java | 2 ++ .../keyvalue/impl/ChunkManagerDispatcher.java | 1 + .../ozone/container/metadata/AbstractRDBStore.java | 9 +++++++++ .../metadata/DatanodeSchemaTwoDBDefinition.java | 1 + .../metadata/DatanodeStoreSchemaThreeImpl.java | 1 + .../DatanodeStoreWithIncrementalChunkList.java | 1 + .../replication/CopyContainerResponseStream.java | 1 + .../ozone/container/replication/ReplicationTask.java | 1 + .../ozone/erasurecode/rawcoder/XORRawEncoder.java | 1 + .../SCMSecurityProtocolClientSideTranslatorPB.java | 1 + ...tainerLocationProtocolClientSideTranslatorPB.java | 1 + .../hadoop/hdds/security/OzoneSecretManager.java | 1 + .../certificate/client/DefaultCertificateClient.java | 1 + .../certificate/client/SCMCertificateClient.java | 1 + .../events/FixedThreadPoolWithAffinityExecutor.java | 2 ++ .../apache/hadoop/hdds/utils/db/DumpFileLoader.java | 1 + .../ozone/rocksdiff/RocksDBCheckpointDiffer.java | 1 + .../scm/block/DeletedBlockLogStateManagerImpl.java | 2 ++ .../hdds/scm/container/ContainerManagerImpl.java | 1 + .../scm/container/ContainerStateManagerImpl.java | 2 ++ .../container/balancer/ContainerBalancerTask.java | 1 + .../scm/container/balancer/FindSourceGreedy.java | 1 + .../balancer/FindTargetGreedyByNetworkTopology.java | 1 + .../balancer/FindTargetGreedyByUsageInfo.java | 1 + .../container/replication/ReplicationManager.java | 1 + .../container/replication/health/AbstractCheck.java | 1 + .../apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java | 1 + .../apache/hadoop/hdds/scm/ha/SCMNodeDetails.java | 1 + .../hdds/scm/metadata/SCMMetadataStoreImpl.java | 1 + .../hdds/scm/node/DatanodeAdminMonitorImpl.java | 1 + .../hdds/scm/pipeline/BackgroundPipelineCreator.java | 1 + .../hdds/scm/pipeline/PipelineManagerImpl.java | 3 +++ .../scm/safemode/HealthyPipelineSafeModeRule.java | 1 + .../apache/hadoop/hdds/scm/server/SCMCertStore.java | 2 ++ .../hdds/scm/server/SCMClientProtocolServer.java | 1 + .../scm/server/SCMDatanodeHeartbeatDispatcher.java | 2 ++ .../hdds/scm/server/upgrade/SCMUpgradeFinalizer.java | 1 + .../java/org/apache/ozone/test/Log4j1Capturer.java | 1 + .../java/org/apache/ozone/test/Log4j2Capturer.java | 1 + .../hdds/scm/cli/ContainerOperationClient.java | 1 + .../ozone/client/io/ECBlockOutputStreamEntry.java | 1 + .../ozone/client/io/OzoneDataStreamOutput.java | 2 ++ .../apache/hadoop/ozone/client/rpc/RpcClient.java | 3 +++ .../om/ha/HadoopRpcOMFailoverProxyProvider.java | 1 + .../hadoop/ozone/om/helpers/BasicOmKeyInfo.java | 2 ++ .../hadoop/ozone/om/helpers/OmMultipartKeyInfo.java | 2 ++ .../ozone/om/protocol/OzoneManagerProtocol.java | 7 +++++++ .../ozone/snapshot/SnapshotDiffReportOzone.java | 1 + .../fs/http/server/HttpFSAuthenticationFilter.java | 1 + .../apache/hadoop/ozone/om/OMMetadataManager.java | 1 + .../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 2 ++ .../org/apache/hadoop/ozone/om/ListIterator.java | 12 ++++++++++++ .../hadoop/ozone/om/OMMultiTenantManagerImpl.java | 2 ++ .../org/apache/hadoop/ozone/om/OzoneManager.java | 9 +++++++++ .../hadoop/ozone/om/response/key/OmKeyResponse.java | 1 + .../ozone/om/service/AbstractKeyDeletingService.java | 1 + .../hadoop/ozone/om/upgrade/OMLayoutFeature.java | 1 + .../hadoop/ozone/om/upgrade/OMUpgradeFinalizer.java | 1 + .../ozone/recon/api/handlers/OBSBucketHandler.java | 1 + .../hadoop/ozone/recon/api/types/EntityType.java | 6 ++++++ .../ozone/recon/metrics/ReconTaskStatusMetrics.java | 1 + .../recon/recovery/ReconOmMetadataManagerImpl.java | 1 + .../hadoop/ozone/recon/scm/ReconNodeManager.java | 1 + .../impl/StorageContainerServiceProviderImpl.java | 1 + .../hadoop/ozone/recon/tasks/OMDBUpdatesHandler.java | 1 + .../hadoop/ozone/s3/endpoint/ObjectEndpoint.java | 1 + .../ozone/s3/signature/AWSSignatureProcessor.java | 1 + .../org/apache/hadoop/ozone/debug/ldb/DBScanner.java | 1 + .../apache/hadoop/ozone/repair/om/FSORepairTool.java | 1 + .../hadoop/ozone/utils/AsyncRollingFileAppender.java | 3 +++ 84 files changed, 148 insertions(+) diff --git a/dev-support/pmd/pmd-ruleset.xml b/dev-support/pmd/pmd-ruleset.xml index 3b251b79b7d5..804f1fe86b74 100644 --- a/dev-support/pmd/pmd-ruleset.xml +++ b/dev-support/pmd/pmd-ruleset.xml @@ -26,5 +26,7 @@ PMD Ruleset for Apache Ozone + + .*/generated-sources/.* diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java index 5391b1007c89..3fbee6be871b 100644 --- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java +++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java @@ -74,6 +74,7 @@ public BlockInputStreamFactoryImpl(ByteBufferPool byteBufferPool, * @param refreshFunction Function to refresh the pipeline if needed * @return BlockExtendedInputStream of the correct type. */ + @Override public BlockExtendedInputStream create(ReplicationConfig repConfig, BlockLocationInfo blockInfo, Pipeline pipeline, Token token, diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactoryImpl.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactoryImpl.java index 0d14c02fa4ed..968d339b252b 100644 --- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactoryImpl.java +++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactoryImpl.java @@ -71,6 +71,7 @@ private ECBlockInputStreamFactoryImpl(BlockInputStreamFactory streamFactory, * @param refreshFunction Function to refresh the pipeline if needed * @return BlockExtendedInputStream of the correct type. */ + @Override public BlockExtendedInputStream create(boolean missingLocations, List failedLocations, ReplicationConfig repConfig, BlockLocationInfo blockInfo, diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNode.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNode.java index be45640e44fc..2fca31c38a53 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNode.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNode.java @@ -94,8 +94,10 @@ Node getLeaf(int leafIndex, List excludedScopes, @Override HddsProtos.NetworkNode toProtobuf(int clientVersion); + @Override boolean equals(Object o); + @Override int hashCode(); static InnerNode fromProtobuf( diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumByteBuffer.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumByteBuffer.java index a523f9b0e55d..9cf4d85caa75 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumByteBuffer.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumByteBuffer.java @@ -35,7 +35,12 @@ public interface ChecksumByteBuffer extends Checksum { * Upon return, the buffer's position will be equal to its limit. * * @param buffer the bytes to update the checksum with + * + * @apiNote {@link Override} annotation is missing since {@link Checksum#update(ByteBuffer)} introduced only in Java9. + * TODO: Remove when Java 1.8 support is dropped. + * TODO: HDDS-12366 */ + @SuppressWarnings("PMD.MissingOverride") void update(ByteBuffer buffer); @Override diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChunkBuffer.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChunkBuffer.java index 5cbe467d9ea8..600a7b56797a 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChunkBuffer.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChunkBuffer.java @@ -84,6 +84,7 @@ default boolean hasRemaining() { /** Similar to {@link ByteBuffer#clear()}. */ ChunkBuffer clear(); + @Override default void close() { } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lock/BootstrapStateHandler.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lock/BootstrapStateHandler.java index 222597bafbed..49befe2c8faf 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lock/BootstrapStateHandler.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lock/BootstrapStateHandler.java @@ -26,6 +26,7 @@ public interface BootstrapStateHandler { /** Bootstrap state handler lock implementation. */ class Lock implements AutoCloseable { private final Semaphore semaphore = new Semaphore(1); + public Lock lock() throws InterruptedException { semaphore.acquire(); return this; @@ -33,6 +34,8 @@ public Lock lock() throws InterruptedException { public void unlock() { semaphore.release(); } + + @Override public void close() { unlock(); } diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/BasicUpgradeFinalizer.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/BasicUpgradeFinalizer.java index fd683a5e0cdf..dcb1eaa4cc2c 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/BasicUpgradeFinalizer.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/BasicUpgradeFinalizer.java @@ -73,6 +73,7 @@ public BasicUpgradeFinalizer(V versionManager, this.finalizationLock = new ReentrantLock(); } + @Override public StatusAndMessages finalize(String upgradeClientID, T service) throws IOException { // In some components, finalization can be driven asynchronously by a @@ -114,6 +115,7 @@ public StatusAndMessages finalize(String upgradeClientID, T service) } } + @Override public synchronized StatusAndMessages reportStatus( String upgradeClientID, boolean takeover) throws UpgradeException { if (takeover) { diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/DefaultUpgradeFinalizationExecutor.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/DefaultUpgradeFinalizationExecutor.java index 4e99656b197b..33c4111c70c8 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/DefaultUpgradeFinalizationExecutor.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/DefaultUpgradeFinalizationExecutor.java @@ -36,6 +36,7 @@ public class DefaultUpgradeFinalizationExecutor public DefaultUpgradeFinalizationExecutor() { } + @Override public void execute(T component, BasicUpgradeFinalizer finalizer) throws IOException { try { 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 35abecd3ed79..6866a5684d6e 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 @@ -64,6 +64,7 @@ public void decrementReference() { } } + @Override public boolean cleanup() { if (getStore() != null && getStore().isClosed() || referenceCount.get() == 0) { diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/DbVolume.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/DbVolume.java index 8c963b0f90c0..f7a99b9b1ee9 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/DbVolume.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/DbVolume.java @@ -104,6 +104,7 @@ public Builder getThis() { return this; } + @Override public DbVolume build() throws IOException { return new DbVolume(this); } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java index 73d660ba59ec..70f25fa138dc 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java @@ -111,6 +111,7 @@ public Builder getThis() { return this; } + @Override public HddsVolume build() throws IOException { return new HddsVolume(this); } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/MetadataVolume.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/MetadataVolume.java index e73c7444c5da..a16980842ca6 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/MetadataVolume.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/MetadataVolume.java @@ -65,6 +65,7 @@ public Builder getThis() { return this; } + @Override public MetadataVolume build() throws IOException { return new MetadataVolume(this); } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerMetadataInspector.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerMetadataInspector.java index a4ebabe3c31f..70029c1701ef 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerMetadataInspector.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerMetadataInspector.java @@ -93,6 +93,7 @@ public enum Mode { this.name = name; } + @Override public String toString() { return name; } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java index 9a61a7bf7285..572d30d8db8a 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java @@ -1378,11 +1378,13 @@ public void deleteUnreferenced(Container container, long localID) } } + @Override public void addFinalizedBlock(Container container, long localID) { KeyValueContainer keyValueContainer = (KeyValueContainer)container; keyValueContainer.getContainerData().addToFinalizedBlockSet(localID); } + @Override public boolean isFinalizedBlockExist(Container container, long localID) { KeyValueContainer keyValueContainer = (KeyValueContainer)container; return keyValueContainer.getContainerData().isFinalizedBlockExist(localID); diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerDispatcher.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerDispatcher.java index 2953a774ac1a..586fdc402f37 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerDispatcher.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerDispatcher.java @@ -72,6 +72,7 @@ public void writeChunk(Container container, BlockID blockID, ChunkInfo info, .writeChunk(container, blockID, info, data, dispatcherContext); } + @Override public String streamInit(Container container, BlockID blockID) throws StorageContainerException { return selectHandler(container) diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractRDBStore.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractRDBStore.java index bccc0e3073c3..16052ce7cdad 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractRDBStore.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractRDBStore.java @@ -56,6 +56,7 @@ protected AbstractRDBStore(DEF dbDef, ConfigurationSource config, boolean openRe start(config); } + @Override public void start(ConfigurationSource config) throws IOException { if (this.store == null) { @@ -81,6 +82,7 @@ public void start(ConfigurationSource config) protected abstract DBStore initDBStore(DBStoreBuilder dbStoreBuilder, ManagedDBOptions options, ConfigurationSource config) throws IOException; + @Override public synchronized void stop() throws Exception { if (store != null) { store.close(); @@ -88,10 +90,12 @@ public synchronized void stop() throws Exception { } } + @Override public DBStore getStore() { return this.store; } + @Override public synchronized boolean isClosed() { if (this.store == null) { return true; @@ -99,23 +103,28 @@ public synchronized boolean isClosed() { return this.store.isClosed(); } + @Override public BatchOperationHandler getBatchHandler() { return this.store; } + @Override public void close() throws IOException { this.store.close(); this.cfOptions.close(); } + @Override public void flushDB() throws IOException { store.flushDB(); } + @Override public void flushLog(boolean sync) throws IOException { store.flushLog(sync); } + @Override public void compactDB() throws IOException { store.compactDB(); } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaTwoDBDefinition.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaTwoDBDefinition.java index ffb54b79eba4..8cc27d7b9b00 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaTwoDBDefinition.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaTwoDBDefinition.java @@ -112,6 +112,7 @@ public DBColumnFamilyDefinition getMetadataColumnFamily() { return DELETE_TRANSACTION; } + @Override public DBColumnFamilyDefinition getFinalizeBlocksColumnFamily() { return FINALIZE_BLOCKS; } diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeStoreSchemaThreeImpl.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeStoreSchemaThreeImpl.java index 9a4b8d4adbf1..d4c03a9422d9 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeStoreSchemaThreeImpl.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeStoreSchemaThreeImpl.java @@ -154,6 +154,7 @@ public static File getDumpDir(File metaDir) { return new File(metaDir, DUMP_DIR); } + @Override public void compactionIfNeeded() throws Exception { // Calculate number of files per level and size per level RocksDatabase rocksDB = ((RDBStore)getStore()).getDb(); diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeStoreWithIncrementalChunkList.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeStoreWithIncrementalChunkList.java index 96c94a938f67..570e3b077fc6 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeStoreWithIncrementalChunkList.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeStoreWithIncrementalChunkList.java @@ -134,6 +134,7 @@ private static boolean shouldAppendLastChunk(boolean endOfBlock, return isFullChunk(data.getChunks().get(data.getChunks().size() - 1)); } + @Override public void putBlockByID(BatchOperation batch, boolean incremental, long localID, BlockData data, KeyValueContainerData containerData, boolean endOfBlock) throws IOException { diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/CopyContainerResponseStream.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/CopyContainerResponseStream.java index baab5ca75a44..61cecf1255b1 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/CopyContainerResponseStream.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/CopyContainerResponseStream.java @@ -33,6 +33,7 @@ class CopyContainerResponseStream super(streamObserver, containerId, bufferSize); } + @Override protected void sendPart(boolean eof, int length, ByteString data) { CopyContainerResponseProto response = CopyContainerResponseProto.newBuilder() diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationTask.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationTask.java index 29d452810bb2..f61e219678ec 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationTask.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/replication/ReplicationTask.java @@ -92,6 +92,7 @@ public int hashCode() { return Objects.hash(getContainerId(), getTarget()); } + @Override public long getContainerId() { return cmd.getContainerID(); } diff --git a/hadoop-hdds/erasurecode/src/main/java/org/apache/ozone/erasurecode/rawcoder/XORRawEncoder.java b/hadoop-hdds/erasurecode/src/main/java/org/apache/ozone/erasurecode/rawcoder/XORRawEncoder.java index b7168d9e7d4e..b4e5c59a4452 100644 --- a/hadoop-hdds/erasurecode/src/main/java/org/apache/ozone/erasurecode/rawcoder/XORRawEncoder.java +++ b/hadoop-hdds/erasurecode/src/main/java/org/apache/ozone/erasurecode/rawcoder/XORRawEncoder.java @@ -35,6 +35,7 @@ public XORRawEncoder(ECReplicationConfig ecReplicationConfig) { super(ecReplicationConfig); } + @Override protected void doEncode(ByteBufferEncodingState encodingState) { CoderUtil.resetOutputBuffers(encodingState.outputs, encodingState.encodeLength); diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java index a74e68f0e014..775aecd7ee05 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java @@ -198,6 +198,7 @@ public String getSCMCertificate(ScmNodeDetailsProto scmNodeDetails, * @return String - pem encoded SCM signed * certificate. */ + @Override public String getSCMCertificate(ScmNodeDetailsProto scmNodeDetails, String certSignReq, boolean renew) throws IOException { return getSCMCertChain(scmNodeDetails, certSignReq, renew) 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 56abee5e4f1f..df1e483566f3 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 @@ -1162,6 +1162,7 @@ public StatusAndMessages queryUpgradeFinalizationProgress( status.getMessagesList()); } + @Override public Token getContainerToken( ContainerID containerID) throws IOException { GetContainerTokenRequestProto request = diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/OzoneSecretManager.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/OzoneSecretManager.java index 06b7179ed105..96a89509a1a8 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/OzoneSecretManager.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/OzoneSecretManager.java @@ -181,6 +181,7 @@ private OzoneSecretKey updateCurrentKey(KeyPair keyPair, return newKey; } + @Override public void notifyCertificateRenewed(CertificateClient client, String oldCertId, String newCertId) { if (!oldCertId.equals(getCertSerialId())) { diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java index eb0501a2bb4c..b3e89d387e55 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java @@ -957,6 +957,7 @@ public Logger getLogger() { return logger; } + @Override public String getComponentName() { return component; } diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/SCMCertificateClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/SCMCertificateClient.java index 9336ab2fbd38..feef456d152c 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/SCMCertificateClient.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/SCMCertificateClient.java @@ -133,6 +133,7 @@ public SCMCertificateClient( * * @return CertificateSignRequest.Builder */ + @Override public CertificateSignRequest.Builder configureCSRBuilder() throws SCMSecurityException { String subject = SCM_SUB_CA_PREFIX + scmHostname; diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/FixedThreadPoolWithAffinityExecutor.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/FixedThreadPoolWithAffinityExecutor.java index 1ebe1ef315a1..f934b20ed610 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/FixedThreadPoolWithAffinityExecutor.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/events/FixedThreadPoolWithAffinityExecutor.java @@ -206,10 +206,12 @@ public long droppedEvents() { return dropped.value(); } + @Override public long longWaitInQueueEvents() { return longWaitInQueue.value(); } + @Override public long longTimeExecutionEvents() { return longTimeExecution.value(); } diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DumpFileLoader.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DumpFileLoader.java index 53de09f486d8..46e51b142ae3 100644 --- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DumpFileLoader.java +++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DumpFileLoader.java @@ -34,5 +34,6 @@ public interface DumpFileLoader extends Closeable { /** * Close this file loader. */ + @Override void close(); } diff --git a/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/rocksdiff/RocksDBCheckpointDiffer.java b/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/rocksdiff/RocksDBCheckpointDiffer.java index c3be8b17f7a1..5f5d9ca1ba80 100644 --- a/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/rocksdiff/RocksDBCheckpointDiffer.java +++ b/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/rocksdiff/RocksDBCheckpointDiffer.java @@ -1024,6 +1024,7 @@ public String getMetadataDir() { static class NodeComparator implements Comparator, Serializable { + @Override public int compare(CompactionNode a, CompactionNode b) { return a.getFileName().compareToIgnoreCase(b.getFileName()); } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogStateManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogStateManagerImpl.java index b0b686ddab63..9a353f1dfff2 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogStateManagerImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLogStateManagerImpl.java @@ -70,6 +70,7 @@ public DeletedBlockLogStateManagerImpl(ConfigurationSource conf, isRatisEnabled ? ConcurrentHashMap.newKeySet() : null; } + @Override public TableIterator> getReadOnlyIterator() throws IOException { return new TableIterator txIDs) return resetCount; } + @Override public void onFlush() { // onFlush() can be invoked only when ratis is enabled. Preconditions.checkNotNull(deletingTxIDs); diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManagerImpl.java index 3ab74a6d5c04..19a41d9befa7 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManagerImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManagerImpl.java @@ -465,6 +465,7 @@ public void close() throws IOException { } // Remove this after fixing Recon + @Override @VisibleForTesting public ContainerStateManager getContainerStateManager() { return containerStateManager; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerStateManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerStateManagerImpl.java index 090697bc2ef5..ed499c1e621a 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerStateManagerImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerStateManagerImpl.java @@ -446,6 +446,7 @@ public void updateDeleteTransactionId( } } + @Override public ContainerInfo getMatchingContainer(final long size, String owner, PipelineID pipelineID, NavigableSet containerIDs) { if (containerIDs.isEmpty()) { @@ -504,6 +505,7 @@ private ContainerInfo findContainerWithSpace(final long size, } + @Override public void removeContainer(final HddsProtos.ContainerID id) throws IOException { final ContainerID cid = ContainerID.getFromProtobuf(id); diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerTask.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerTask.java index 78c916b2aa87..a6bbb54641a5 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerTask.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/ContainerBalancerTask.java @@ -179,6 +179,7 @@ public ContainerBalancerTask(StorageContainerManager scm, /** * Run the container balancer task. */ + @Override public void run() { try { if (delayStart) { diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindSourceGreedy.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindSourceGreedy.java index a2b11e247be1..cfcba7695979 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindSourceGreedy.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindSourceGreedy.java @@ -70,6 +70,7 @@ private void setLowerLimit(Double lowerLimit) { /** * {@inheritDoc} */ + @Override public void resetPotentialSources( @Nonnull Collection sources) { List usageInfos = new ArrayList<>(sources.size()); diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByNetworkTopology.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByNetworkTopology.java index 8d6f6b2a4037..cd02c9f2beee 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByNetworkTopology.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByNetworkTopology.java @@ -63,6 +63,7 @@ public FindTargetGreedyByNetworkTopology( * network topology. * @param source the specified source datanode */ + @Override @VisibleForTesting public void sortTargetForSource(DatanodeDetails source) { Collections.sort(potentialTargets, diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByUsageInfo.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByUsageInfo.java index 4e09c3eeb502..6f76b39b2c93 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByUsageInfo.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/balancer/FindTargetGreedyByUsageInfo.java @@ -51,6 +51,7 @@ public FindTargetGreedyByUsageInfo( /** * do nothing , since TreeSet is ordered itself. */ + @Override @VisibleForTesting public void sortTargetForSource(DatanodeDetails source) { //noop, Treeset is naturally sorted. diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java index aefce14e7276..a0401a7cae33 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ReplicationManager.java @@ -305,6 +305,7 @@ public boolean isRunning() { /** * Stops Replication Monitor thread. */ + @Override public synchronized void stop() { if (running) { LOG.info("Stopping Replication Monitor Thread."); diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/AbstractCheck.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/AbstractCheck.java index 80c7a40c0428..8f23b75bc188 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/AbstractCheck.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/AbstractCheck.java @@ -34,6 +34,7 @@ public abstract class AbstractCheck implements HealthCheck { * @return True if the request was handled or false if it was not and should * be handled by the next handler in the chain. */ + @Override public boolean handleChain(ContainerCheckRequest request) { boolean result = handle(request); if (!result && successor != null) { diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java index b86241f7cc3f..6056a8c0f465 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManagerImpl.java @@ -164,6 +164,7 @@ private void createStartTransactionBufferMonitor() { trxBufferMonitorService.start(); } + @Override public SCMRatisServer getRatisServer() { return ratisServer; } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeDetails.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeDetails.java index 49769d38637f..9deda16f28f0 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeDetails.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeDetails.java @@ -152,6 +152,7 @@ public SCMNodeDetails build() { } } + @Override public String getRpcAddressString() { return NetUtils.getHostPortString(getRpcAddress()); } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStoreImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStoreImpl.java index d371e6ce3089..254ce10edbe4 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStoreImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMMetadataStoreImpl.java @@ -228,6 +228,7 @@ public Table getMetaTable() { return metaTable; } + @Override public Table getStatefulServiceConfigTable() { return statefulServiceConfigTable; } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java index 0f138cfffd84..d18ea6c064a0 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeAdminMonitorImpl.java @@ -181,6 +181,7 @@ public synchronized void stopMonitoring(DatanodeDetails dn) { cancelledNodes.add(tn); } + @Override public synchronized void setMetrics(NodeDecommissionMetrics metrics) { this.metrics = metrics; } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/BackgroundPipelineCreator.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/BackgroundPipelineCreator.java index ddb4d8ddc547..744b5dc1ebb5 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/BackgroundPipelineCreator.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/BackgroundPipelineCreator.java @@ -145,6 +145,7 @@ public void start() { /** * Stop RatisPipelineUtilsThread. */ + @Override public void stop() { if (!running.compareAndSet(true, false)) { LOG.warn("{} is not running, just ignore.", threadName); diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java index 115d69b74fc7..2dcf2d56f2e3 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineManagerImpl.java @@ -490,6 +490,7 @@ private void closeContainersForPipeline(final PipelineID pipelineId) * @throws IOException throws exception in case of failure * @deprecated Do not use this method, onTimeout is not honored. */ + @Override @Deprecated public void closePipeline(Pipeline pipeline, boolean onTimeout) throws IOException { @@ -501,6 +502,7 @@ public void closePipeline(Pipeline pipeline, boolean onTimeout) * @param pipelineID ID of the Pipeline to be closed * @throws IOException In case of exception while closing the Pipeline */ + @Override public void closePipeline(PipelineID pipelineID) throws IOException { HddsProtos.PipelineID pipelineIDProtobuf = pipelineID.getProtobuf(); // close containers. @@ -525,6 +527,7 @@ public void closePipeline(PipelineID pipelineID) throws IOException { * @param pipelineID ID of the Pipeline to be deleted * @throws IOException In case of exception while deleting the Pipeline */ + @Override public void deletePipeline(PipelineID pipelineID) throws IOException { removePipeline(getPipeline(pipelineID)); } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/HealthyPipelineSafeModeRule.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/HealthyPipelineSafeModeRule.java index 160619233042..b2f9d99e8a8d 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/HealthyPipelineSafeModeRule.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/safemode/HealthyPipelineSafeModeRule.java @@ -147,6 +147,7 @@ protected synchronized void process(Pipeline pipeline) { } + @Override public synchronized void refresh(boolean forceRefresh) { if (forceRefresh) { initializeRule(true); diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMCertStore.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMCertStore.java index 540c77e58a9e..4484713f18e7 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMCertStore.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMCertStore.java @@ -84,6 +84,7 @@ public void storeValidCertificate(BigInteger serialID, * @param certificate - Certificate to persist. * @throws IOException - on Failure. */ + @Override public void storeValidScmCertificate(BigInteger serialID, X509Certificate certificate) throws IOException { lock.lock(); @@ -101,6 +102,7 @@ public void storeValidScmCertificate(BigInteger serialID, } } + @Override public void checkValidCertID(BigInteger serialID) throws IOException { lock.lock(); try { diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java index 6ac7964af256..a7aac3bfa498 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java @@ -892,6 +892,7 @@ public void transferLeadership(String newLeaderId) } } + @Override public List getFailedDeletedBlockTxn(int count, long startTxId) throws IOException { List result; diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java index 08481044c6e4..fac19fce99c0 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java @@ -322,6 +322,7 @@ public int hashCode() { return this.getDatanodeDetails().getUuid().hashCode(); } + @Override public ContainerReportType getType() { return ContainerReportType.FCR; } @@ -369,6 +370,7 @@ public int hashCode() { return this.getDatanodeDetails().getUuid().hashCode(); } + @Override public ContainerReportType getType() { return ContainerReportType.ICR; } diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java index ed90dd244399..1e187b20814d 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/upgrade/SCMUpgradeFinalizer.java @@ -106,6 +106,7 @@ void replicatedFinalizationSteps(HDDSLayoutFeature lf, context.getStorage()); } + @Override public void postFinalizeUpgrade(SCMUpgradeFinalizationContext context) throws IOException { // If we reached this phase of finalization, all layout features should diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j1Capturer.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j1Capturer.java index fa79f2cd8799..8b16c980d470 100644 --- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j1Capturer.java +++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j1Capturer.java @@ -53,6 +53,7 @@ private static Layout getDefaultLayout() { logger.addAppender(appender); } + @Override public void stopCapturing() { logger.removeAppender(appender); } diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j2Capturer.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j2Capturer.java index cfe238fd8acb..4a8fc46d8d5d 100644 --- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j2Capturer.java +++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/Log4j2Capturer.java @@ -41,6 +41,7 @@ private Log4j2Capturer() { addAppender(writer()); } + @Override public void stopCapturing() { final LoggerContext context = LoggerContext.getContext(false); final Configuration config = context.getConfiguration(); 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 73cf7946fb4d..afce9669fbda 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 @@ -469,6 +469,7 @@ public Map> getSafeModeRuleStatuses() return storageContainerLocationClient.getSafeModeRuleStatuses(); } + @Override public boolean forceExitSafeMode() throws IOException { return storageContainerLocationClient.forceExitSafeMode(); } diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockOutputStreamEntry.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockOutputStreamEntry.java index 32b28ae72559..d4b583c6a921 100644 --- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockOutputStreamEntry.java +++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockOutputStreamEntry.java @@ -416,6 +416,7 @@ public ByteString calculateChecksum() throws IOException { * Builder class for ChunkGroupOutputStreamEntry. * */ public static class Builder extends BlockOutputStreamEntry.Builder { + @Override public ECBlockOutputStreamEntry build() { return new ECBlockOutputStreamEntry(this); } diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/OzoneDataStreamOutput.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/OzoneDataStreamOutput.java index 53e581bdc258..7ce3f71b375b 100644 --- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/OzoneDataStreamOutput.java +++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/io/OzoneDataStreamOutput.java @@ -134,10 +134,12 @@ public KeyDataStreamOutput getKeyDataStreamOutput() { return null; } + @Override public void hflush() throws IOException { hsync(); } + @Override public void hsync() throws IOException { // Disable the feature flag restores the prior behavior. if (!enableHsync) { 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 ebd5c6a1b1fc..f395f8352dda 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 @@ -520,6 +520,7 @@ private void updateS3Principal(String userPrincipal) { } } + @Override public OzoneVolume buildOzoneVolume(OmVolumeArgs volume) { return OzoneVolume.newBuilder(conf, this) .setName(volume.getVolume()) @@ -826,6 +827,7 @@ public S3SecretValue getS3Secret(String kerberosID, boolean createIfNotExist) /** * {@inheritDoc} */ + @Override public S3SecretValue setS3Secret(String accessId, String secretKey) throws IOException { Preconditions.checkArgument(StringUtils.isNotBlank(accessId), @@ -1003,6 +1005,7 @@ public void deleteSnapshot(String volumeName, * @return snapshot info for volume/bucket snapshot path. * @throws IOException */ + @Override public OzoneSnapshot getSnapshotInfo(String volumeName, String bucketName, String snapshotName) throws IOException { diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/HadoopRpcOMFailoverProxyProvider.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/HadoopRpcOMFailoverProxyProvider.java index 498f6bf14140..5c8cd55ca859 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/HadoopRpcOMFailoverProxyProvider.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/ha/HadoopRpcOMFailoverProxyProvider.java @@ -67,6 +67,7 @@ public HadoopRpcOMFailoverProxyProvider(ConfigurationSource configuration, this.delegationTokenService = computeDelegationTokenService(); } + @Override protected void loadOMClientConfigs(ConfigurationSource config, String omSvcId) throws IOException { Map> omProxies = new HashMap<>(); diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/BasicOmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/BasicOmKeyInfo.java index 738d029a6a2c..bec3495be1ef 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/BasicOmKeyInfo.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/BasicOmKeyInfo.java @@ -259,6 +259,7 @@ public static BasicOmKeyInfo getFromProtobuf(String volumeName, return builder.build(); } + @Override public boolean equals(Object o) { if (this == o) { return true; @@ -279,6 +280,7 @@ public boolean equals(Object o) { ownerName.equals(basicOmKeyInfo.ownerName); } + @Override public int hashCode() { return Objects.hash(volumeName, bucketName, keyName); } diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java index 9b5ca12d6422..1f61cd39bf1f 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java @@ -265,11 +265,13 @@ public Builder addPartKeyInfoList(int partNum, PartKeyInfo partKeyInfo) { return this; } + @Override public Builder setObjectID(long obId) { super.setObjectID(obId); return this; } + @Override public Builder setUpdateID(long id) { super.setUpdateID(id); return this; diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java index 77ab5746dfe6..570f71f770ff 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java @@ -310,6 +310,7 @@ default OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID, * @throws IOException * @deprecated use {@link OzoneManagerProtocol#getKeyInfo} instead. */ + @Override @Deprecated OmKeyInfo lookupKey(OmKeyArgs args) throws IOException; @@ -322,6 +323,7 @@ default OmKeyLocationInfo allocateBlock(OmKeyArgs args, long clientID, * @return KeyInfoWithVolumeContext includes info that client uses to talk * to containers and S3 volume context info if assumeS3Context is set. */ + @Override KeyInfoWithVolumeContext getKeyInfo(OmKeyArgs args, boolean assumeS3Context) throws IOException; @@ -949,6 +951,7 @@ default OpenKeySession createFile(OmKeyArgs keyArgs, boolean overWrite, * invalid arguments * @deprecated use {@link OzoneManagerProtocol#getKeyInfo} instead. */ + @Override @Deprecated OmKeyInfo lookupFile(OmKeyArgs keyArgs) throws IOException; @@ -963,6 +966,7 @@ default OpenKeySession createFile(OmKeyArgs keyArgs, boolean overWrite, * @param numEntries Number of entries to list from the start key * @return list of file status */ + @Override List listStatus(OmKeyArgs keyArgs, boolean recursive, String startKey, long numEntries) throws IOException; @@ -979,6 +983,7 @@ List listStatus(OmKeyArgs keyArgs, boolean recursive, * this is needed in context of ListKeys * @return list of file status */ + @Override List listStatus(OmKeyArgs keyArgs, boolean recursive, String startKey, long numEntries, boolean allowPartialPrefixes) @@ -997,6 +1002,7 @@ List listStatus(OmKeyArgs keyArgs, boolean recursive, * this is needed in context of ListKeys * @return list of file status */ + @Override List listStatusLight(OmKeyArgs keyArgs, boolean recursive, String startKey, long numEntries, boolean allowPartialPrefixes) throws IOException; @@ -1148,6 +1154,7 @@ boolean setSafeMode(SafeModeAction action, boolean isChecked) * @param args Key args * @return Tags associated with the key. */ + @Override Map getObjectTagging(OmKeyArgs args) throws IOException; /** diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java index a9770b7a294f..e4d18a2e61b7 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java @@ -84,6 +84,7 @@ public SnapshotDiffReportOzone(final String snapshotRoot, this.token = token; } + @Override public List getDiffList() { return super.getDiffList(); } diff --git a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSAuthenticationFilter.java b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSAuthenticationFilter.java index b739591c21b6..b71fbd123430 100644 --- a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSAuthenticationFilter.java +++ b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSAuthenticationFilter.java @@ -121,6 +121,7 @@ protected Properties getConfiguration(String configPrefix, return props; } + @Override protected Configuration getProxyuserConfiguration(FilterConfig filterConfig) { Map proxyuserConf = HttpFSServerWebApp.get().getConfig(). getValByRegex("httpfs\\.proxyuser\\."); diff --git a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java index 0c165c2b53e7..1082b690a4ed 100644 --- a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java +++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java @@ -449,6 +449,7 @@ String getMultipartKeyFSO(String volume, String bucket, String key, String */ Table getMultipartInfoTable(); + @Override Table getTransactionInfoTable(); Table getTenantAccessIdTable(); 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 54b4608e64f2..1985538c7333 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 @@ -801,6 +801,7 @@ public SnapshotDeletingService getSnapshotDeletingService() { return snapshotDeletingService; } + @Override public SnapshotDirectoryCleaningService getSnapshotDirectoryService() { return snapshotDirectoryCleaningService; } @@ -1636,6 +1637,7 @@ public List listStatus(OmKeyArgs args, boolean recursive, return listStatus(args, recursive, startKey, numEntries, null); } + @Override public List listStatus(OmKeyArgs args, boolean recursive, String startKey, long numEntries, String clientAddress) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java index ad4d020a6f16..3d0e2b71db48 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java @@ -85,11 +85,13 @@ public Object getValue() { return value; } + @Override public int compareTo(HeapEntry other) { return Comparator.comparing(HeapEntry::getKey) .thenComparing(HeapEntry::getEntryIteratorId).compare(this, other); } + @Override public boolean equals(Object other) { if (!(other instanceof HeapEntry)) { @@ -101,6 +103,7 @@ public boolean equals(Object other) { return this.compareTo(that) == 0; } + @Override public int hashCode() { return key.hashCode(); } @@ -153,6 +156,7 @@ private void getNextKey() throws IOException { } } + @Override public boolean hasNext() { try { getNextKey(); @@ -162,6 +166,7 @@ public boolean hasNext() { return currentEntry != null; } + @Override public HeapEntry next() { if (hasNext()) { HeapEntry ret = currentEntry; @@ -171,6 +176,7 @@ public HeapEntry next() { throw new NoSuchElementException(); } + @Override public void close() throws IOException { tableIterator.close(); } @@ -240,16 +246,19 @@ public boolean doesKeyExistInCache(String key) { return cacheKeyMap.containsKey(key); } + @Override public boolean hasNext() { return cacheCreatedKeyIter.hasNext(); } + @Override public HeapEntry next() { Map.Entry entry = cacheCreatedKeyIter.next(); return new HeapEntry(this.entryIteratorId, this.tableName, entry.getKey(), entry.getValue()); } + @Override public void close() { // Nothing to close here } @@ -323,10 +332,12 @@ public static class MinHeapIterator implements ClosableIterator { } + @Override public boolean hasNext() { return !minHeap.isEmpty(); } + @Override public HeapEntry next() { HeapEntry heapEntry = minHeap.remove(); // remove the least element and @@ -339,6 +350,7 @@ public HeapEntry next() { return heapEntry; } + @Override public void close() throws IOException { IOUtils.closeQuietly(iterators); } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java index a96b5a5762d6..d611f5632cce 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java @@ -148,6 +148,7 @@ public OMMultiTenantManagerImpl(OzoneManager ozoneManager, this.start(); } + @Override public OMRangerBGSyncService getOMRangerBGSyncService() { return omRangerBGSyncService; } @@ -717,6 +718,7 @@ public String getUserNameGivenAccessId(String accessId) { /** * {@inheritDoc} */ + @Override public boolean isTenantAdmin(UserGroupInformation callerUgi, String tenantId, boolean delegated) { if (callerUgi == null) { 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 73043a89b39a..e778ac4d352d 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 @@ -1111,6 +1111,7 @@ private void stopSecretManager() { } } + @Override public UUID refetchSecretKey() { secretKeyClient.refetchSecretKey(); return secretKeyClient.getCurrentSecretKey().getId(); @@ -3087,6 +3088,7 @@ public OMHAMetrics getOmhaMetrics() { return omhaMetrics; } + @Override public String getRatisLogDirectory() { return OzoneManagerRatisUtils.getOMRatisDirectory(configuration); } @@ -3414,6 +3416,7 @@ public StatusAndMessages queryUpgradeFinalizationProgress( /** * List tenants. */ + @Override public TenantStateList listTenant() throws IOException { metrics.incNumTenantLists(); @@ -3468,6 +3471,7 @@ public TenantStateList listTenant() throws IOException { /** * Tenant get user info. */ + @Override public TenantUserInfoValue tenantGetUserInfo(String userPrincipal) throws IOException { @@ -3767,6 +3771,7 @@ public List listStatus(OmKeyArgs args, boolean recursive, return listStatus(args, recursive, startKey, numEntries, false); } + @Override public List listStatus(OmKeyArgs args, boolean recursive, String startKey, long numEntries, boolean allowPartialPrefixes) throws IOException { @@ -4879,6 +4884,7 @@ private ReferenceCounted getReader(OzoneObj ozoneObj) ozoneObj.getKeyName()); } + @Override @SuppressWarnings("parameternumber") public SnapshotDiffResponse snapshotDiff(String volume, String bucket, @@ -4896,6 +4902,7 @@ public SnapshotDiffResponse snapshotDiff(String volume, fromSnapshot, toSnapshot, token, pageSize, forceFullDiff, disableNativeDiff); } + @Override public CancelSnapshotDiffResponse cancelSnapshotDiff(String volume, String bucket, String fromSnapshot, @@ -4906,6 +4913,7 @@ public CancelSnapshotDiffResponse cancelSnapshotDiff(String volume, fromSnapshot, toSnapshot); } + @Override public List listSnapshotDiffJobs(String volume, String bucket, String jobStatus, @@ -4920,6 +4928,7 @@ public List listSnapshotDiffJobs(String volume, jobStatus, listAll); } + @Override public String printCompactionLogDag(String fileNamePrefix, String graphType) throws IOException { diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OmKeyResponse.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OmKeyResponse.java index 5f3f601a4367..1225d9fbb517 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OmKeyResponse.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OmKeyResponse.java @@ -39,6 +39,7 @@ public OmKeyResponse(OzoneManagerProtocolProtos.OMResponse omResponse) { this.bucketLayout = BucketLayout.DEFAULT; } + @Override public BucketLayout getBucketLayout() { return bucketLayout; } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java index 7b7d1e238639..4ae7f5a0e2c4 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java @@ -673,6 +673,7 @@ public long getMovedFilesCount() { return movedFilesCount.get(); } + @Override public BootstrapStateHandler.Lock getBootstrapStateLock() { return lock; } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutFeature.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutFeature.java index 5be977a6b413..7deeef51161c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutFeature.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMLayoutFeature.java @@ -89,6 +89,7 @@ public void addAction(UpgradeActionType type, OmUpgradeAction action) { this.actions.put(type, action); } + @Override public Optional action(UpgradeActionType phase) { return Optional.ofNullable(actions.get(phase)); } diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMUpgradeFinalizer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMUpgradeFinalizer.java index 2cb786197ab9..5fbf76feba33 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMUpgradeFinalizer.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/upgrade/OMUpgradeFinalizer.java @@ -42,6 +42,7 @@ public void finalizeLayoutFeature(LayoutFeature layoutFeature, om.getOmStorage()); } + @Override public void runPrefinalizeStateActions(Storage storage, OzoneManager om) throws IOException { super.runPrefinalizeStateActions( diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/OBSBucketHandler.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/OBSBucketHandler.java index c180bd87d0da..870f030219f9 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/OBSBucketHandler.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/OBSBucketHandler.java @@ -259,6 +259,7 @@ public Table getKeyTable() { return getOmMetadataManager().getKeyTable(getBucketLayout()); } + @Override public BucketLayout getBucketLayout() { return BucketLayout.OBJECT_STORE; } diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/EntityType.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/EntityType.java index 721bbfaeb964..129b38ca526c 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/EntityType.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/types/EntityType.java @@ -34,6 +34,7 @@ */ public enum EntityType { ROOT { + @Override public EntityHandler create( ReconNamespaceSummaryManager reconNamespaceSummaryManager, ReconOMMetadataManager omMetadataManager, @@ -44,6 +45,7 @@ public EntityHandler create( } }, VOLUME { + @Override public EntityHandler create( ReconNamespaceSummaryManager reconNamespaceSummaryManager, ReconOMMetadataManager omMetadataManager, @@ -54,6 +56,7 @@ public EntityHandler create( } }, BUCKET { + @Override public EntityHandler create( ReconNamespaceSummaryManager reconNamespaceSummaryManager, ReconOMMetadataManager omMetadataManager, @@ -64,6 +67,7 @@ public EntityHandler create( } }, DIRECTORY { + @Override public EntityHandler create( ReconNamespaceSummaryManager reconNamespaceSummaryManager, ReconOMMetadataManager omMetadataManager, @@ -74,6 +78,7 @@ public EntityHandler create( } }, KEY { + @Override public EntityHandler create( ReconNamespaceSummaryManager reconNamespaceSummaryManager, ReconOMMetadataManager omMetadataManager, @@ -84,6 +89,7 @@ public EntityHandler create( } }, UNKNOWN { // if path is invalid + @Override public EntityHandler create( ReconNamespaceSummaryManager reconNamespaceSummaryManager, ReconOMMetadataManager omMetadataManager, diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/metrics/ReconTaskStatusMetrics.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/metrics/ReconTaskStatusMetrics.java index 21b610003392..3246d57cc4d2 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/metrics/ReconTaskStatusMetrics.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/metrics/ReconTaskStatusMetrics.java @@ -63,6 +63,7 @@ public void unregister() { .unregisterSource(SOURCE_NAME); } + @Override public void getMetrics(MetricsCollector collector, boolean all) { List rows = reconTaskStatusDao.findAll(); rows.forEach((rts) -> { diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOmMetadataManagerImpl.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOmMetadataManagerImpl.java index f547d93b264e..671e7c1f9e39 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOmMetadataManagerImpl.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOmMetadataManagerImpl.java @@ -293,6 +293,7 @@ public List listBucketsUnderVolume(final String volumeName, * @return buckets under volume or all buckets if volume is null * @throws IOException IOE */ + @Override public List listBucketsUnderVolume(final String volumeName) throws IOException { return listBucketsUnderVolume(volumeName, null, diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconNodeManager.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconNodeManager.java index e088bb6764d7..d9d1fd5b4c48 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconNodeManager.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ReconNodeManager.java @@ -153,6 +153,7 @@ public void addNodeToDB(DatanodeDetails datanodeDetails) throws IOException { * @param datanodeDetails DatanodeDetails * @return last heartbeat time */ + @Override public long getLastHeartbeat(DatanodeDetails datanodeDetails) { return datanodeHeartbeatMap.getOrDefault(datanodeDetails.getUuid(), 0L); } diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/StorageContainerServiceProviderImpl.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/StorageContainerServiceProviderImpl.java index 7030f4264700..06dfb973a5de 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/StorageContainerServiceProviderImpl.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/StorageContainerServiceProviderImpl.java @@ -176,6 +176,7 @@ private boolean isOmSpnegoEnabled() { .equals("kerberos"); } + @Override public DBCheckpoint getSCMDBSnapshot() { String snapshotFileName = RECON_SCM_SNAPSHOT_DB + "_" + System.currentTimeMillis(); diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OMDBUpdatesHandler.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OMDBUpdatesHandler.java index 6ade5969d710..cfcf33a109d7 100644 --- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OMDBUpdatesHandler.java +++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OMDBUpdatesHandler.java @@ -325,6 +325,7 @@ public void markCommit(byte[] bytes) throws RocksDBException { */ } + @Override public void markCommitWithTimestamp(final byte[] xid, final byte[] ts) throws RocksDBException { /** diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java index 61fd71fae71e..4210baf498ca 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/ObjectEndpoint.java @@ -190,6 +190,7 @@ public ObjectEndpoint() { @Inject private OzoneConfiguration ozoneConfiguration; + @Override @PostConstruct public void init() { bufferSize = (int) ozoneConfiguration.getStorageSize( diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/AWSSignatureProcessor.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/AWSSignatureProcessor.java index eb634910375f..f02839f303d1 100644 --- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/AWSSignatureProcessor.java +++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/AWSSignatureProcessor.java @@ -59,6 +59,7 @@ public class AWSSignatureProcessor implements SignatureProcessor { @Context private ContainerRequestContext context; + @Override public SignatureInfo parseSignature() throws OS3Exception { LowerCaseKeyStringMap headers = diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ldb/DBScanner.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ldb/DBScanner.java index 94eb08e31793..bd74aca5bb99 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ldb/DBScanner.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/ldb/DBScanner.java @@ -903,6 +903,7 @@ public void log(ArrayList msg, long sequenceId) { } private final class WriterTask implements Runnable { + @Override public void run() { try { while (!stop) { diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java index bc895a2dd679..8b45435a4f97 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java @@ -590,6 +590,7 @@ public ReportStatistics getUnreferenced() { return unreferenced; } + @Override public String toString() { return "Reachable:" + reachable + "\nUnreachable:" + unreachable + "\nUnreferenced:" + unreferenced; } diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/utils/AsyncRollingFileAppender.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/utils/AsyncRollingFileAppender.java index 8c3b71707dff..d99ffe32a5d5 100644 --- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/utils/AsyncRollingFileAppender.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/utils/AsyncRollingFileAppender.java @@ -112,14 +112,17 @@ public boolean isBlocking() { return blocking; } + @Override public synchronized void setBlocking(boolean blocking) { this.blocking = blocking; } + @Override public synchronized int getBufferSize() { return bufferSize; } + @Override public synchronized void setBufferSize(int bufferSize) { this.bufferSize = bufferSize; }