Skip to content

Merge master into upgrade#1985

Closed
errose28 wants to merge 33 commits intoapache:HDDS-3698-nonrolling-upgradefrom
errose28:merge-master-into-upgrade
Closed

Merge master into upgrade#1985
errose28 wants to merge 33 commits intoapache:HDDS-3698-nonrolling-upgradefrom
errose28:merge-master-into-upgrade

Conversation

@errose28
Copy link
Contributor

@errose28 errose28 commented Mar 2, 2021

What changes were proposed in this pull request?

Merge master (as of 3/2/2021) into nonrolling upgrade feature branch.

How was this patch tested?

Existing CI.

adoroszlai and others added 30 commits February 18, 2021 10:11
…REPLICATION (apache#1946)

* HDDS-4851. More compatibility problem with DatanodeDetails.Port.Name.REPLICATION

* trigger new CI check
…ient. (apache#1976)

* HDDS-4864. Add acceptance tests to certify Ozone with boto3 python client (ghuangups via swagle)

Authored-by: Jun Huang <junhuang@Juns-MacBook-Pro.local>
…ing-upgrade

* upstream/master: (29 commits)
  HDDS-4741. Modularize upgrade test (apache#1928)
  HDDS-4864. Add acceptance tests to certify Ozone with boto3 python client. (apache#1976)
  HDDS-4791. StateContext.getReports may return list with size larger t… (apache#1892)
  HDDS-4867. Ozone admin datanode list should report dead and stale nodes (apache#1966)
  HDDS-4858. Useless Maven cache cleanup (apache#1956)
  HDDS-4769. Simplify insert operation of ContainerAttribute (apache#1865)
  HDDS-4847. Fix typo in name of IdentityService (apache#1941)
  HDDS-4869. Bump jackson version number (apache#1963)
  HDDS-4871. Fix intellij runConfigurations for datanode (apache#1968)
  HDDS-4870. Bump jetty version (apache#1964)
  HDDS-4722. Creating RDBStore fails due to RDBMetrics instance race (apache#1820)
  HDDS-4138. Improve crc efficiency by using Java.util.zip.CRC when available (apache#1950)
  HDDS-4816. Add UsageInfoSubcommand to get Datanode usage information. (apache#1919)
  HDDS-4754. Make scm heartbeat rpc retry interval configurable (apache#1942)
  HDDS-4832. Show Datanode OperationalState in Recon (apache#1937)
  HDDS-4653. Support TDE for MPU Keys on Encrypted Buckets (apache#1766)
  HDDS-4853. libexec/entrypoint.sh might copy from wrong path (apache#1951)
  HDDS-4857. Format ReplicationType.java which indentation are confusion (apache#1952)
  HDDS-4850. Intermittent failure in ozonesecure due to unable to allocate block (apache#1948)
  HDDS-4808. Add Genesis benchmark for various CRC implementations (apache#1910)
  ...

Conflicts:
	hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
	hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
	hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
	hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/StorageContainerLocationProtocolClientSideTranslatorPB.java
	hadoop-hdds/interface-admin/src/main/proto/ScmAdminProtocol.proto
	hadoop-hdds/interface-client/src/main/proto/hdds.proto
	hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
	hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMClientProtocolServer.java
	hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
	hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
…grade

* HDDS-3698-nonrolling-upgrade:
  HDDS-4946. Do not wait one heartbeat to move newly registered datanodes that match SCM's MLV from HEALTHY_READONLY to HEALTHY (apache#2015)
@errose28
Copy link
Contributor Author

Changes were condensed into one merge commit matching the contents of this PR and committed directly to HDDS-3698-nonrolling-upgrade. Closing this PR.

@errose28 errose28 closed this Mar 11, 2021
@errose28 errose28 deleted the merge-master-into-upgrade branch June 1, 2021 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.