Clone Tools
  • last updated 18 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'trunk' into HDFS-7240

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java

Added the following code in:

hadoop/ozone/container/common/impl/ContainerManagerImpl.java

@Override

public void readLockInterruptibly() throws InterruptedException {

this.lock.readLock().lockInterruptibly();

}

and Manually updated the value of version in

modified: hadoop-tools/hadoop-ozone/pom.xml

to

<version>3.2.0-SNAPSHOT</version>

  1. … 17 more files in changeset.
HDFS-13149. Ozone: Rename Corona to Freon. Contributed by Anu Engineer.

    • -0
    • +1146
    ./tools/Freon.java
  1. … 7 more files in changeset.
HDFS-13149. Ozone: Rename Corona to Freon. Contributed by Anu Engineer.

    • -0
    • +1146
    ./tools/Freon.java
  1. … 6 more files in changeset.
HDFS-13116. Ozone: Refactor Pipeline to have transport and container specific information. Contributed by Mukul Kumar Singh.

    • -10
    • +117
    ./scm/pipelines/PipelineManager.java
    • -10
    • +13
    ./scm/pipelines/PipelineSelector.java
    • -159
    • +32
    ./scm/pipelines/ratis/RatisManagerImpl.java
    • -22
    • +38
    ./scm/pipelines/standalone/StandaloneManagerImpl.java
  1. … 9 more files in changeset.
HDFS-13116. Ozone: Refactor Pipeline to have transport and container specific information. Contributed by Mukul Kumar Singh.

    • -10
    • +117
    ./scm/pipelines/PipelineManager.java
    • -10
    • +13
    ./scm/pipelines/PipelineSelector.java
    • -159
    • +32
    ./scm/pipelines/ratis/RatisManagerImpl.java
    • -22
    • +38
    ./scm/pipelines/standalone/StandaloneManagerImpl.java
  1. … 9 more files in changeset.
HDFS-13127. Fix TestContainerStateManager and TestOzoneConfigurationFields. Contributed by Mukul Kumar Singh.

    • -2
    • +1
    ./scm/container/ContainerStateManager.java
  1. … 3 more files in changeset.
HDFS-13127. Fix TestContainerStateManager and TestOzoneConfigurationFields. Contributed by Mukul Kumar Singh.

    • -2
    • +1
    ./scm/container/ContainerStateManager.java
  1. … 3 more files in changeset.
HDFS-12522. Ozone: Remove the Priority Queues used in the Container State Manager. Contributed by Anu Engineer.

    • -0
    • +13
    ./container/common/helpers/ContainerReport.java
    • -33
    • +42
    ./scm/container/ContainerMapping.java
    • -263
    • +148
    ./scm/container/ContainerStateManager.java
    • -0
    • +244
    ./scm/container/ContainerStates/ContainerAttribute.java
    • -0
    • +402
    ./scm/container/ContainerStates/ContainerStateMap.java
  1. … 14 more files in changeset.
HDFS-12522. Ozone: Remove the Priority Queues used in the Container State Manager. Contributed by Anu Engineer.

    • -0
    • +13
    ./container/common/helpers/ContainerReport.java
    • -33
    • +42
    ./scm/container/ContainerMapping.java
    • -263
    • +148
    ./scm/container/ContainerStateManager.java
    • -0
    • +244
    ./scm/container/ContainerStates/ContainerAttribute.java
    • -0
    • +402
    ./scm/container/ContainerStates/ContainerStateMap.java
  1. … 13 more files in changeset.
HDFS-13080. Ozone: Make finalhash in ContainerInfo of StorageContainerDatanodeProtocol.proto optional. Contributed by Elek, Marton.

  1. … 1 more file in changeset.
HDFS-13072. Ozone: DatanodeStateMachine: Handling Uncaught Exception in command handler thread. Contributed by Nanda kumar.

HDFS-13072. Ozone: DatanodeStateMachine: Handling Uncaught Exception in command handler thread. Contributed by Nanda kumar.

HDFS-12868. Ozone: Service Discovery API. Contributed by Nanda Kumar.

  1. … 9 more files in changeset.
HDFS-12868. Ozone: Service Discovery API. Contributed by Nanda Kumar.

  1. … 9 more files in changeset.
HDFS-12986. Ozone: Update ozone to latest ratis snapshot build (0.1.1-alpha-0f7169d-SNAPSHOT). Contributed by Lokesh Jain

  1. … 2 more files in changeset.
HDFS-12986. Ozone: Update ozone to latest ratis snapshot build (0.1.1-alpha-0f7169d-SNAPSHOT). Contributed by Lokesh Jain

  1. … 3 more files in changeset.
HDFS-13024. Ozone: ContainerStateMachine should synchronize operations between createContainer and writeChunk. Contributed by Mukul Kumar Singh.

  1. … 3 more files in changeset.
HDFS-13024. Ozone: ContainerStateMachine should synchronize operations between createContainer and writeChunk. Contributed by Mukul Kumar Singh.

  1. … 3 more files in changeset.
HDFS-12940. Ozone: KSM: TestKeySpaceManager#testExpiredOpenKey fails occasionally. Contributed by Nanda kumar.

  1. … 2 more files in changeset.
HDFS-12940. Ozone: KSM: TestKeySpaceManager#testExpiredOpenKey fails occasionally. Contributed by Nanda kumar.

  1. … 2 more files in changeset.
HDFS-13026. Ozone: TestContainerPersistence is failing becaue of container data mismatch. Contributed by Mukul Kumar Singh.

    • -2
    • +7
    ./container/common/impl/ChunkManagerImpl.java
  1. … 1 more file in changeset.
HDFS-13026. Ozone: TestContainerPersistence is failing becaue of container data mismatch. Contributed by Mukul Kumar Singh.

    • -2
    • +7
    ./container/common/impl/ChunkManagerImpl.java
  1. … 1 more file in changeset.
HDFS-13013. Fix closeContainer API with the right container state change. Contributed by Xiaoyu Yao.

    • -21
    • +7
    ./protocolPB/StorageContainerLocationProtocolServerSideTranslatorPB.java
    • -26
    • +31
    ./scm/StorageContainerManager.java
    • -19
    • +4
    ./scm/container/ContainerMapping.java
  1. … 5 more files in changeset.
HDFS-13013. Fix closeContainer API with the right container state change. Contributed by Xiaoyu Yao.

    • -21
    • +7
    ./protocolPB/StorageContainerLocationProtocolServerSideTranslatorPB.java
    • -26
    • +31
    ./scm/StorageContainerManager.java
    • -19
    • +4
    ./scm/container/ContainerMapping.java
  1. … 5 more files in changeset.
Revert "HDFS-12794. Ozone: Parallelize ChunkOutputSream Writes to container. Contributed by Shashikant Banerjee."

This reverts commit 6ce5ec676164b84a9e2f8dc65b5f2199a141506d.

  1. … 7 more files in changeset.
Revert "HDFS-12794. Ozone: Parallelize ChunkOutputSream Writes to container. Contributed by Shashikant Banerjee."

This reverts commit 6ce5ec676164b84a9e2f8dc65b5f2199a141506d.

  1. … 7 more files in changeset.
HDFS-12794. Ozone: Parallelize ChunkOutputSream Writes to container. Contributed by Shashikant Banerjee.

  1. … 7 more files in changeset.
HDFS-12794. Ozone: Parallelize ChunkOutputSream Writes to container. Contributed by Shashikant Banerjee.

  1. … 7 more files in changeset.
HDFS-12966. Ozone: owner name should be set properly when the container allocation happens. Contributed by Shashikant Banerjee.

    • -1
    • +1
    ./protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java
    • -1
    • +2
    ./protocolPB/StorageContainerLocationProtocolServerSideTranslatorPB.java
    • -22
    • +35
    ./scm/container/ContainerStateManager.java
  1. … 28 more files in changeset.
HDFS-12966. Ozone: owner name should be set properly when the container allocation happens. Contributed by Shashikant Banerjee.

    • -1
    • +1
    ./protocolPB/ScmBlockLocationProtocolServerSideTranslatorPB.java
    • -1
    • +2
    ./protocolPB/StorageContainerLocationProtocolServerSideTranslatorPB.java
    • -22
    • +35
    ./scm/container/ContainerStateManager.java
  1. … 28 more files in changeset.