Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HDDS-10479. Support Ozone to run ratis local related commands #7170

Merged
merged 10 commits into from
Sep 20, 2024

Conversation

sarvekshayr
Copy link
Contributor

@sarvekshayr sarvekshayr commented Sep 6, 2024

What changes were proposed in this pull request?

Added support to ozone to run ratis related commands.

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/HDDS-10479

How was this patch tested?

Added unit tests in TestOzoneRatis.

Tested the CLI on a docker cluster.

bash-4.4$ ozone ratis
Usage: ratis sh [generic options]
         [election [transfer] [stepDown] [pause] [resume]]         
         [group [info] [list]]                                     
         [local [raftMetaConf]]                                    
         [peer [add] [remove] [setPriority]]                       
         [snapshot [create]] 
bash-4.4$ ozone ratis local raftMetaConf -peers "peer1|localhost:8080,peer2|localhost:8081" -path ../.././data/metadata/ratis/bf265839-605b-3f16-9796-c5ba1605619e/current/
Index in the original file is: 0
Generate new LogEntryProto info is:
index: 1
configurationEntry {
  peers {
    id: "peer1"
    address: "localhost:8080"
    startupRole: FOLLOWER
  }
  peers {
    id: "peer2"
    address: "localhost:8081"
    startupRole: FOLLOWER
  }
}
bash-4.4$ ozone ratis local raftMetaConf
Failed to parse args for raftMetaConf: Missing required options: peers, path
Usage: raftMetaConf -peers <[P0_ID|]P0_HOST:P0_PORT,[P1_ID|]P1_HOST:P1_PORT,[P2_ID|]P2_HOST:P2_PORT> -path <PARENT_PATH_OF_RAFT_META_CONF>
Generate a new raft-meta.conf file based on original raft-meta.conf and new peers.
bash-4.4$ ozone ratis local raftMetaConf -path ../.././data/metadata/ratis/bf265839-605b-3f16-9796-c5ba1605619e/current/
Failed to parse args for raftMetaConf: Missing required option: peers
Usage: raftMetaConf -peers <[P0_ID|]P0_HOST:P0_PORT,[P1_ID|]P1_HOST:P1_PORT,[P2_ID|]P2_HOST:P2_PORT> -path <PARENT_PATH_OF_RAFT_META_CONF>
Generate a new raft-meta.conf file based on original raft-meta.conf and new peers.
bash-4.4$ ozone ratis local raftMetaConf -peers localhost:8080
Failed to parse args for raftMetaConf: Missing required option: path
Usage: raftMetaConf -peers <[P0_ID|]P0_HOST:P0_PORT,[P1_ID|]P1_HOST:P1_PORT,[P2_ID|]P2_HOST:P2_PORT> -path <PARENT_PATH_OF_RAFT_META_CONF>
Generate a new raft-meta.conf file based on original raft-meta.conf and new peers.
bash-4.4$ ozone ratis local raftMetaConf -peers "localhost8080" -path ../.././data/metadata/ratis/bf265839-605b-3f16-9796-c5ba1605619e/current/
Failed to parse the server address parameter "localhost8080".
bash-4.4$ ozone ratis local raftMetaConf -peers "peer1|localhost:8081,peer2|localhost:8081" -path ../.././data/metadata/ratis/bf265839-605b-3f16-9796-c5
ba1605619e/current/
Found duplicated address: localhost:8081. Please make sure the address of peer have no duplicated value.
bash-4.4$ ozone ratis local raftMetaConf -peers "peer1|localhost:8080,peer1|localhost:8081" -path ../.././data/metadata/ratis/bf265839-605b-3f16-9796-c5ba1605619e/current/
Found duplicated ID: peer1. Please make sure the ID of peer have no duplicated value.

@sarvekshayr sarvekshayr changed the title HDDS-10479. Add ozone admin ratis local raftMetaConf CLI to generate a new raft-meta.conf. HDDS-10479. Add ozone admin ratis local raftMetaConf CLI to generate a new raft-meta.conf. Sep 6, 2024
Copy link
Contributor

@sumitagrawl sumitagrawl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sarvekshayr Thanks for working over this, have few review comment.

@sumitagrawl sumitagrawl changed the title HDDS-10479. Add ozone admin ratis local raftMetaConf CLI to generate a new raft-meta.conf. HDDS-10479. Add ozone admin ratis local raftMetaConf Sep 6, 2024
@errose28
Copy link
Contributor

errose28 commented Sep 6, 2024

Hi @sarvekshayr, I have a few questions about this PR.

  • What is the intended use case for this command?
  • Can we leave this to the Ratis CLI without manually copying over ratis sh commands to Ozone? If we need Ratis commands it would probably be better to ship Ratis shell directly with our Ozone release.
  • Everything under ozone admin should run over the network. If this needs to be run from a specific host to modify the server's files it should go under ozone repair.

@sumitagrawl
Copy link
Contributor

  • What is the intended use case for this command?

@errose28
This command is used for recovery of ratis qourum. i.e. one of node goes down and unable to retrieve, this till will help in regenerate raftMetaConf with new peers.

This case is observed when one of SCM metada gots deleted in some of recovery.

@kerneltime
Copy link
Contributor

cc @hemantk-12 This might be useful for manually backing up and restoring OM.

@errose28
Copy link
Contributor

We had some discussion on this and came up with the following points:

  • It will be useful to have a command ozone ratis that works the same as the ratis CLI, but automatically populates the TLS information required to communicate with a secure Ozone cluster.
    • Currently ratis invoked from the command line does not support TLS and will fail.
  • We should implement this in a way where Ozone can just forward arguments to Ratis. We should not manually create wrappers of the same names for every Ratis CLI, like how this change is currently implemented.
  • One possible solution proposed by @szetszwo was a Ratis change that exposes RatisShell and allows passing a builder for TLS configuration. Then from the ozone ratis subcommand we could do something like this:
RatisShell shell = new Builder().setTlsConf(tls).build();
shell.run(args)

@szetszwo
Copy link
Contributor

Filed RATIS-2155 "Add a builder for RatisShell".

@szetszwo
Copy link
Contributor

For the local raftMetaConf command, we don't have to wait for RATIS-2155 since it is a "local" command which does not require TLS.

Copy link
Contributor

@szetszwo szetszwo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sarvekshayr , thanks for the update! The change looks good. Just some minor comments inlined.

Copy link
Contributor

@szetszwo szetszwo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 the change looks good.

Copy link
Contributor

@sumitagrawl sumitagrawl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@sarvekshayr sarvekshayr changed the title HDDS-10479. Add ozone admin ratis local raftMetaConf HDDS-10479. Support Ozone to run ratis local related commands Sep 20, 2024
@sumitagrawl sumitagrawl merged commit 40c4001 into apache:master Sep 20, 2024
39 checks passed
aswinshakil added a commit to aswinshakil/ozone that referenced this pull request Oct 1, 2024
COMMITS:
360fea5 HDDS-11494. Improve the duration option of freon ombg (apache#7246)
10d3b21 HDDS-11504. Update Ratis to 3.1.1. (apache#7257)
ce46297 HDDS-11162. Improve Disk Usage page UI (apache#7214)
c91f1c7 HDDS-11491. Avoid sharing clientId among deleting services (apache#7250)
b0943d5 HDDS-11501. Improve logging in XceiverServerRatis (apache#7252)
55925ab HDDS-11502. Class path contains multiple SLF4J providers (apache#7255)
d0ad836 HDDS-11472. Avoid recreating external access authorizer on OM state reload (apache#7238)
254db9e HDDS-11500. RootCARotationManager cancelling wrong task in notifyStatusChanged (apache#7251)
1e6e4b3 HDDS-11499. Remove redundant code from ECReconstructionCoordinator. (apache#7248)
adb2821 HDDS-11490. Bump rollup to 3.29.5 (apache#7232)
189a9fe HDDS-11484. Validate javadoc in CI (apache#7245)
64a29c6 HDDS-11497. Bump commons-configuration2 to 2.11.0 (apache#7242)
95cfadd HDDS-11496. Bump maven-install-plugin to 3.1.3 (apache#7244)
0a999cf HDDS-11493. Bump sqlite-jdbc to 3.46.1.3 (apache#7243)
a214a31 HDDS-11329. Update Ozone images to Rocky Linux-based runner (apache#7241)
56ddb85 HDDS-11371. Handle cases where OM does not have getServerDefaults() implemented. (apache#7130)
b5097c7 HDDS-11347. Add rocks_tools_native lib check in Ozone CLI checknative subcommand (apache#7101)
fb0bf77 HDDS-11489. Bump maven-site-plugin to 3.20.0 (apache#7226)
70e6e40 HDDS-11122. Fix javadoc warnings (apache#7234)
acf3fdc HDDS-11458. Selective checks: trigger checkstyle for properties file changes (apache#7196)
6b87207 HDDS-11469. Statistics of Pipeline and Container (apache#7217)
1b8468b HDDS-11411. Snapshot garbage collection should not run when the keys are moved from a deleted snapshot to the next snapshot in the chain (apache#7193)
1f86ce8 HDDS-10617. Unexpected number of files in ITestS3AContractGetFileStatusV1List (apache#7208)
73a3bcc HDDS-11467. Bump vite to 4.5.5 (apache#7212)
d45aa1d HDDS-11460. Bump express to 4.21.0 (apache#7197)
e2e30b8 HDDS-11354. Intermittent failure in TestOzoneManagerSnapshotAcl#testLookupKeyWithNotAllowedUserForPrefixAcl (apache#7205)
0fcb645 HDDS-11477. [doc] Add configuration description for datanode docs (apache#7223)
3598ee3 HDDS-11464. Removed unused constants from OzoneConsts. (apache#7207)
8c0b54e HDDS-11408. Snapshot rename table entries are propagated incorrectly on snapshot deletes (apache#7200)
719bdf9 HDDS-11396. NPE due to empty Handler#clusterId (apache#7145)
40c4001 HDDS-10479. Add ozone admin ratis local raftMetaConf (apache#7170)
45f9138 HDDS-11394. Fix pipeline close --all command (apache#7138)
2b196d1 HDDS-11468. Enabled DB sync button (apache#7216)
d3899d2 Clean up files created after TestKeyValueHandlerWithUnhealthyContainer#testMarkContainerUnhealthyInFailedVolume (apache#7219)
70b8dd5 HDDS-11157. Improve Datanodes page UI (apache#7168)
151709a HDDS-11446. Downgrade picocli to 4.7.5 due to regression (apache#7215)
7a26aff HDDS-11158. Improve Pipelines page UI (apache#7171)
c365aa0 HDDS-11181. Cleanup of unnecessary try-catch blocks (apache#7210)
88dd436 HDDS-11423. Implement equals operation for --filter option to ozone ldb scan (apache#7167)
95cfadd HDDS-11496. Bump maven-install-plugin to 3.1.3 (apache#7244)
0a999cf HDDS-11493. Bump sqlite-jdbc to 3.46.1.3 (apache#7243)
a214a31 HDDS-11329. Update Ozone images to Rocky Linux-based runner (apache#7241)
56ddb85 HDDS-11371. Handle cases where OM does not have getServerDefaults() implemented. (apache#7130)
b5097c7 HDDS-11347. Add rocks_tools_native lib check in Ozone CLI checknative subcommand (apache#7101)
fb0bf77 HDDS-11489. Bump maven-site-plugin to 3.20.0 (apache#7226)
70e6e40 HDDS-11122. Fix javadoc warnings (apache#7234)
acf3fdc HDDS-11458. Selective checks: trigger checkstyle for properties file changes (apache#7196)
6b87207 HDDS-11469. Statistics of Pipeline and Container (apache#7217)
1b8468b HDDS-11411. Snapshot garbage collection should not run when the keys are moved from a deleted snaps
hot to the next snapshot in the chain (apache#7193)
1f86ce8 HDDS-10617. Unexpected number of files in ITestS3AContractGetFileStatusV1List (apache#7208)
73a3bcc HDDS-11467. Bump vite to 4.5.5 (apache#7212)
d45aa1d HDDS-11460. Bump express to 4.21.0 (apache#7197)
e2e30b8 HDDS-11354. Intermittent failure in TestOzoneManagerSnapshotAcl#testLookupKeyWithNotAllowedUserForP
refixAcl (apache#7205)
0fcb645 HDDS-11477. [doc] Add configuration description for datanode docs (apache#7223)
3598ee3 HDDS-11464. Removed unused constants from OzoneConsts. (apache#7207)
8c0b54e HDDS-11408. Snapshot rename table entries are propagated incorrectly on snapshot deletes (apache#7200)
719bdf9 HDDS-11396. NPE due to empty Handler#clusterId (apache#7145)
40c4001 HDDS-10479. Add ozone admin ratis local raftMetaConf (apache#7170)
45f9138 HDDS-11394. Fix pipeline close --all command (apache#7138)
2b196d1 HDDS-11468. Enabled DB sync button (apache#7216)
d3899d2 Clean up files created after TestKeyValueHandlerWithUnhealthyContainer#testMarkContainerUnhealthyIn
FailedVolume (apache#7219)
70b8dd5 HDDS-11157. Improve Datanodes page UI (apache#7168)
151709a HDDS-11446. Downgrade picocli to 4.7.5 due to regression (apache#7215)
7a26aff HDDS-11158. Improve Pipelines page UI (apache#7171)
c365aa0 HDDS-11181. Cleanup of unnecessary try-catch blocks (apache#7210)
88dd436 HDDS-11423. Implement equals operation for --filter option to ozone ldb scan (apache#7167)
e0060a8 HDDS-11196. Improve SCM WebUI Display (apache#6960)
22ddfb9 Revert "HDDS-11456. Require successful dependency/licence checks for acceptance/compile/kubernetes (apache#7192)"
9f5bf43 HDDS-11457. Internal error on S3 CompleteMultipartUpload if parts are not specified (apache#7195)
10c47a1 HDDS-11459. Bump develocity-maven-extension to 1.22.1 (apache#7201)
50f2563 HDDS-11419. Fix waitForCheckpointDirectoryExist log message (apache#7199)
a7d7e37 HDDS-11456. Require successful dependency/licence checks for acceptance/compile/kubernetes (apache#7192)
5feb9ea HDDS-11453. OmSnapshotPurge should be in a different ozone manager double buffer batch (apache#7188)
703c4d5 HDDS-10984. Tool to restore SCM certificates from RocksDB. (apache#6781)
d221065 HDDS-11440. Add a lastTransactionInfo field in SnapshotInfo to check for transactions in flight on the snapshot (apache#7179)
e573701 HDDS-11448. Improve documentation in ContainerStateMachine (apache#7183)
0e49f7a HDDS-11449. Remove unnecessary log from client console. (apache#7184)
cd251f2 HDDS-11438. Ensure DataInputBuffer is closed in OMPBHelper#convert (apache#7182)
4b47812 HDDS-11389. Incorrect number of deleted containers shown in Recon UI. (apache#7149)
0915f0b HDDS-10985. EC Reconstruction failed because the size of currentChunks was not equal to checksumBlockDataChunks. (apache#7009)
0f16195 HDDS-11416. refactor ratis submit request avoid code duplicate (apache#7166)
86fe920 HDDS-11376. Improve ReplicationSupervisor to record replication metrics (apache#7140)

CONFLICT:
Merge conflict in hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandlerWithUnhealthyContainer.java

MODIFIED:
/Users/abalasubramanian/Documents/ozone/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/DNContainerOperationClient.java
/Users/abalasubramanian/Documents/ozone/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/ReconcileContainerTask.java
aswinshakil added a commit to aswinshakil/ozone that referenced this pull request Oct 1, 2024
COMMITS:
360fea5 HDDS-11494. Improve the duration option of freon ombg (apache#7246)
10d3b21 HDDS-11504. Update Ratis to 3.1.1. (apache#7257)
ce46297 HDDS-11162. Improve Disk Usage page UI (apache#7214)
c91f1c7 HDDS-11491. Avoid sharing clientId among deleting services (apache#7250)
b0943d5 HDDS-11501. Improve logging in XceiverServerRatis (apache#7252)
55925ab HDDS-11502. Class path contains multiple SLF4J providers (apache#7255)
d0ad836 HDDS-11472. Avoid recreating external access authorizer on OM state reload (apache#7238)
254db9e HDDS-11500. RootCARotationManager cancelling wrong task in notifyStatusChanged (apache#7251)
1e6e4b3 HDDS-11499. Remove redundant code from ECReconstructionCoordinator. (apache#7248)
adb2821 HDDS-11490. Bump rollup to 3.29.5 (apache#7232)
189a9fe HDDS-11484. Validate javadoc in CI (apache#7245)
64a29c6 HDDS-11497. Bump commons-configuration2 to 2.11.0 (apache#7242)
95cfadd HDDS-11496. Bump maven-install-plugin to 3.1.3 (apache#7244)
0a999cf HDDS-11493. Bump sqlite-jdbc to 3.46.1.3 (apache#7243)
a214a31 HDDS-11329. Update Ozone images to Rocky Linux-based runner (apache#7241)
56ddb85 HDDS-11371. Handle cases where OM does not have getServerDefaults() implemented. (apache#7130)
b5097c7 HDDS-11347. Add rocks_tools_native lib check in Ozone CLI checknative subcommand (apache#7101)
fb0bf77 HDDS-11489. Bump maven-site-plugin to 3.20.0 (apache#7226)
70e6e40 HDDS-11122. Fix javadoc warnings (apache#7234)
acf3fdc HDDS-11458. Selective checks: trigger checkstyle for properties file changes (apache#7196)
6b87207 HDDS-11469. Statistics of Pipeline and Container (apache#7217)
1b8468b HDDS-11411. Snapshot garbage collection should not run when the keys are moved from a deleted snapshot to the next snapshot in the chain (apache#7193)
1f86ce8 HDDS-10617. Unexpected number of files in ITestS3AContractGetFileStatusV1List (apache#7208)
73a3bcc HDDS-11467. Bump vite to 4.5.5 (apache#7212)
d45aa1d HDDS-11460. Bump express to 4.21.0 (apache#7197)
e2e30b8 HDDS-11354. Intermittent failure in TestOzoneManagerSnapshotAcl#testLookupKeyWithNotAllowedUserForPrefixAcl (apache#7205)
0fcb645 HDDS-11477. [doc] Add configuration description for datanode docs (apache#7223)
3598ee3 HDDS-11464. Removed unused constants from OzoneConsts. (apache#7207)
8c0b54e HDDS-11408. Snapshot rename table entries are propagated incorrectly on snapshot deletes (apache#7200)
719bdf9 HDDS-11396. NPE due to empty Handler#clusterId (apache#7145)
40c4001 HDDS-10479. Add ozone admin ratis local raftMetaConf (apache#7170)
45f9138 HDDS-11394. Fix pipeline close --all command (apache#7138)
2b196d1 HDDS-11468. Enabled DB sync button (apache#7216)
d3899d2 Clean up files created after TestKeyValueHandlerWithUnhealthyContainer#testMarkContainerUnhealthyInFailedVolume (apache#7219)
70b8dd5 HDDS-11157. Improve Datanodes page UI (apache#7168)
151709a HDDS-11446. Downgrade picocli to 4.7.5 due to regression (apache#7215)
7a26aff HDDS-11158. Improve Pipelines page UI (apache#7171)
c365aa0 HDDS-11181. Cleanup of unnecessary try-catch blocks (apache#7210)
88dd436 HDDS-11423. Implement equals operation for --filter option to ozone ldb scan (apache#7167)
95cfadd HDDS-11496. Bump maven-install-plugin to 3.1.3 (apache#7244)
0a999cf HDDS-11493. Bump sqlite-jdbc to 3.46.1.3 (apache#7243)
a214a31 HDDS-11329. Update Ozone images to Rocky Linux-based runner (apache#7241)
56ddb85 HDDS-11371. Handle cases where OM does not have getServerDefaults() implemented. (apache#7130)
b5097c7 HDDS-11347. Add rocks_tools_native lib check in Ozone CLI checknative subcommand (apache#7101)
fb0bf77 HDDS-11489. Bump maven-site-plugin to 3.20.0 (apache#7226)
70e6e40 HDDS-11122. Fix javadoc warnings (apache#7234)
acf3fdc HDDS-11458. Selective checks: trigger checkstyle for properties file changes (apache#7196)
6b87207 HDDS-11469. Statistics of Pipeline and Container (apache#7217)
1b8468b HDDS-11411. Snapshot garbage collection should not run when the keys are moved from a deleted snaps
hot to the next snapshot in the chain (apache#7193)
1f86ce8 HDDS-10617. Unexpected number of files in ITestS3AContractGetFileStatusV1List (apache#7208)
73a3bcc HDDS-11467. Bump vite to 4.5.5 (apache#7212)
d45aa1d HDDS-11460. Bump express to 4.21.0 (apache#7197)
e2e30b8 HDDS-11354. Intermittent failure in TestOzoneManagerSnapshotAcl#testLookupKeyWithNotAllowedUserForP
refixAcl (apache#7205)
0fcb645 HDDS-11477. [doc] Add configuration description for datanode docs (apache#7223)
3598ee3 HDDS-11464. Removed unused constants from OzoneConsts. (apache#7207)
8c0b54e HDDS-11408. Snapshot rename table entries are propagated incorrectly on snapshot deletes (apache#7200)
719bdf9 HDDS-11396. NPE due to empty Handler#clusterId (apache#7145)
40c4001 HDDS-10479. Add ozone admin ratis local raftMetaConf (apache#7170)
45f9138 HDDS-11394. Fix pipeline close --all command (apache#7138)
2b196d1 HDDS-11468. Enabled DB sync button (apache#7216)
d3899d2 Clean up files created after TestKeyValueHandlerWithUnhealthyContainer#testMarkContainerUnhealthyIn
FailedVolume (apache#7219)
70b8dd5 HDDS-11157. Improve Datanodes page UI (apache#7168)
151709a HDDS-11446. Downgrade picocli to 4.7.5 due to regression (apache#7215)
7a26aff HDDS-11158. Improve Pipelines page UI (apache#7171)
c365aa0 HDDS-11181. Cleanup of unnecessary try-catch blocks (apache#7210)
88dd436 HDDS-11423. Implement equals operation for --filter option to ozone ldb scan (apache#7167)
e0060a8 HDDS-11196. Improve SCM WebUI Display (apache#6960)
22ddfb9 Revert "HDDS-11456. Require successful dependency/licence checks for acceptance/compile/kubernetes (apache#7192)"
9f5bf43 HDDS-11457. Internal error on S3 CompleteMultipartUpload if parts are not specified (apache#7195)
10c47a1 HDDS-11459. Bump develocity-maven-extension to 1.22.1 (apache#7201)
50f2563 HDDS-11419. Fix waitForCheckpointDirectoryExist log message (apache#7199)
a7d7e37 HDDS-11456. Require successful dependency/licence checks for acceptance/compile/kubernetes (apache#7192)
5feb9ea HDDS-11453. OmSnapshotPurge should be in a different ozone manager double buffer batch (apache#7188)
703c4d5 HDDS-10984. Tool to restore SCM certificates from RocksDB. (apache#6781)
d221065 HDDS-11440. Add a lastTransactionInfo field in SnapshotInfo to check for transactions in flight on the snapshot (apache#7179)
e573701 HDDS-11448. Improve documentation in ContainerStateMachine (apache#7183)
0e49f7a HDDS-11449. Remove unnecessary log from client console. (apache#7184)
cd251f2 HDDS-11438. Ensure DataInputBuffer is closed in OMPBHelper#convert (apache#7182)
4b47812 HDDS-11389. Incorrect number of deleted containers shown in Recon UI. (apache#7149)
0915f0b HDDS-10985. EC Reconstruction failed because the size of currentChunks was not equal to checksumBlockDataChunks. (apache#7009)
0f16195 HDDS-11416. refactor ratis submit request avoid code duplicate (apache#7166)
86fe920 HDDS-11376. Improve ReplicationSupervisor to record replication metrics (apache#7140)

CONFLICT:
Merge conflict in hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandlerWithUnhealthyContainer.java

MODIFIED:
/Users/abalasubramanian/Documents/ozone/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/DNContainerOperationClient.java
/Users/abalasubramanian/Documents/ozone/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/ReconcileContainerTask.java
aswinshakil added a commit to aswinshakil/ozone that referenced this pull request Oct 2, 2024
COMMITS:
360fea5 HDDS-11494. Improve the duration option of freon ombg (apache#7246)
10d3b21 HDDS-11504. Update Ratis to 3.1.1. (apache#7257)
ce46297 HDDS-11162. Improve Disk Usage page UI (apache#7214)
c91f1c7 HDDS-11491. Avoid sharing clientId among deleting services (apache#7250)
b0943d5 HDDS-11501. Improve logging in XceiverServerRatis (apache#7252)
55925ab HDDS-11502. Class path contains multiple SLF4J providers (apache#7255)
d0ad836 HDDS-11472. Avoid recreating external access authorizer on OM state reload (apache#7238)
254db9e HDDS-11500. RootCARotationManager cancelling wrong task in notifyStatusChanged (apache#7251)
1e6e4b3 HDDS-11499. Remove redundant code from ECReconstructionCoordinator. (apache#7248)
adb2821 HDDS-11490. Bump rollup to 3.29.5 (apache#7232)
189a9fe HDDS-11484. Validate javadoc in CI (apache#7245)
64a29c6 HDDS-11497. Bump commons-configuration2 to 2.11.0 (apache#7242)
95cfadd HDDS-11496. Bump maven-install-plugin to 3.1.3 (apache#7244)
0a999cf HDDS-11493. Bump sqlite-jdbc to 3.46.1.3 (apache#7243)
a214a31 HDDS-11329. Update Ozone images to Rocky Linux-based runner (apache#7241)
56ddb85 HDDS-11371. Handle cases where OM does not have getServerDefaults() implemented. (apache#7130)
b5097c7 HDDS-11347. Add rocks_tools_native lib check in Ozone CLI checknative subcommand (apache#7101)
fb0bf77 HDDS-11489. Bump maven-site-plugin to 3.20.0 (apache#7226)
70e6e40 HDDS-11122. Fix javadoc warnings (apache#7234)
acf3fdc HDDS-11458. Selective checks: trigger checkstyle for properties file changes (apache#7196)
6b87207 HDDS-11469. Statistics of Pipeline and Container (apache#7217)
1b8468b HDDS-11411. Snapshot garbage collection should not run when the keys are moved from a deleted snapshot to the next snapshot in the chain (apache#7193)
1f86ce8 HDDS-10617. Unexpected number of files in ITestS3AContractGetFileStatusV1List (apache#7208)
73a3bcc HDDS-11467. Bump vite to 4.5.5 (apache#7212)
d45aa1d HDDS-11460. Bump express to 4.21.0 (apache#7197)
e2e30b8 HDDS-11354. Intermittent failure in TestOzoneManagerSnapshotAcl#testLookupKeyWithNotAllowedUserForPrefixAcl (apache#7205)
0fcb645 HDDS-11477. [doc] Add configuration description for datanode docs (apache#7223)
3598ee3 HDDS-11464. Removed unused constants from OzoneConsts. (apache#7207)
8c0b54e HDDS-11408. Snapshot rename table entries are propagated incorrectly on snapshot deletes (apache#7200)
719bdf9 HDDS-11396. NPE due to empty Handler#clusterId (apache#7145)
40c4001 HDDS-10479. Add ozone admin ratis local raftMetaConf (apache#7170)
45f9138 HDDS-11394. Fix pipeline close --all command (apache#7138)
2b196d1 HDDS-11468. Enabled DB sync button (apache#7216)
d3899d2 Clean up files created after TestKeyValueHandlerWithUnhealthyContainer#testMarkContainerUnhealthyInFailedVolume (apache#7219)
70b8dd5 HDDS-11157. Improve Datanodes page UI (apache#7168)
151709a HDDS-11446. Downgrade picocli to 4.7.5 due to regression (apache#7215)
7a26aff HDDS-11158. Improve Pipelines page UI (apache#7171)
c365aa0 HDDS-11181. Cleanup of unnecessary try-catch blocks (apache#7210)
88dd436 HDDS-11423. Implement equals operation for --filter option to ozone ldb scan (apache#7167)
95cfadd HDDS-11496. Bump maven-install-plugin to 3.1.3 (apache#7244)
0a999cf HDDS-11493. Bump sqlite-jdbc to 3.46.1.3 (apache#7243)
a214a31 HDDS-11329. Update Ozone images to Rocky Linux-based runner (apache#7241)
56ddb85 HDDS-11371. Handle cases where OM does not have getServerDefaults() implemented. (apache#7130)
b5097c7 HDDS-11347. Add rocks_tools_native lib check in Ozone CLI checknative subcommand (apache#7101)
fb0bf77 HDDS-11489. Bump maven-site-plugin to 3.20.0 (apache#7226)
70e6e40 HDDS-11122. Fix javadoc warnings (apache#7234)
acf3fdc HDDS-11458. Selective checks: trigger checkstyle for properties file changes (apache#7196)
6b87207 HDDS-11469. Statistics of Pipeline and Container (apache#7217)
1b8468b HDDS-11411. Snapshot garbage collection should not run when the keys are moved from a deleted snaps
hot to the next snapshot in the chain (apache#7193)
1f86ce8 HDDS-10617. Unexpected number of files in ITestS3AContractGetFileStatusV1List (apache#7208)
73a3bcc HDDS-11467. Bump vite to 4.5.5 (apache#7212)
d45aa1d HDDS-11460. Bump express to 4.21.0 (apache#7197)
e2e30b8 HDDS-11354. Intermittent failure in TestOzoneManagerSnapshotAcl#testLookupKeyWithNotAllowedUserForP
refixAcl (apache#7205)
0fcb645 HDDS-11477. [doc] Add configuration description for datanode docs (apache#7223)
3598ee3 HDDS-11464. Removed unused constants from OzoneConsts. (apache#7207)
8c0b54e HDDS-11408. Snapshot rename table entries are propagated incorrectly on snapshot deletes (apache#7200)
719bdf9 HDDS-11396. NPE due to empty Handler#clusterId (apache#7145)
40c4001 HDDS-10479. Add ozone admin ratis local raftMetaConf (apache#7170)
45f9138 HDDS-11394. Fix pipeline close --all command (apache#7138)
2b196d1 HDDS-11468. Enabled DB sync button (apache#7216)
d3899d2 Clean up files created after TestKeyValueHandlerWithUnhealthyContainer#testMarkContainerUnhealthyIn
FailedVolume (apache#7219)
70b8dd5 HDDS-11157. Improve Datanodes page UI (apache#7168)
151709a HDDS-11446. Downgrade picocli to 4.7.5 due to regression (apache#7215)
7a26aff HDDS-11158. Improve Pipelines page UI (apache#7171)
c365aa0 HDDS-11181. Cleanup of unnecessary try-catch blocks (apache#7210)
88dd436 HDDS-11423. Implement equals operation for --filter option to ozone ldb scan (apache#7167)
e0060a8 HDDS-11196. Improve SCM WebUI Display (apache#6960)
22ddfb9 Revert "HDDS-11456. Require successful dependency/licence checks for acceptance/compile/kubernetes (apache#7192)"
9f5bf43 HDDS-11457. Internal error on S3 CompleteMultipartUpload if parts are not specified (apache#7195)
10c47a1 HDDS-11459. Bump develocity-maven-extension to 1.22.1 (apache#7201)
50f2563 HDDS-11419. Fix waitForCheckpointDirectoryExist log message (apache#7199)
a7d7e37 HDDS-11456. Require successful dependency/licence checks for acceptance/compile/kubernetes (apache#7192)
5feb9ea HDDS-11453. OmSnapshotPurge should be in a different ozone manager double buffer batch (apache#7188)
703c4d5 HDDS-10984. Tool to restore SCM certificates from RocksDB. (apache#6781)
d221065 HDDS-11440. Add a lastTransactionInfo field in SnapshotInfo to check for transactions in flight on the snapshot (apache#7179)
e573701 HDDS-11448. Improve documentation in ContainerStateMachine (apache#7183)
0e49f7a HDDS-11449. Remove unnecessary log from client console. (apache#7184)
cd251f2 HDDS-11438. Ensure DataInputBuffer is closed in OMPBHelper#convert (apache#7182)
4b47812 HDDS-11389. Incorrect number of deleted containers shown in Recon UI. (apache#7149)
0915f0b HDDS-10985. EC Reconstruction failed because the size of currentChunks was not equal to checksumBlockDataChunks. (apache#7009)
0f16195 HDDS-11416. refactor ratis submit request avoid code duplicate (apache#7166)
86fe920 HDDS-11376. Improve ReplicationSupervisor to record replication metrics (apache#7140)

CONFLICT:
Merge conflict in hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandlerWithUnhealthyContainer.java

MODIFIED:
/Users/abalasubramanian/Documents/ozone/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/DNContainerOperationClient.java
/Users/abalasubramanian/Documents/ozone/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/ReconcileContainerTask.java
aswinshakil added a commit to aswinshakil/ozone that referenced this pull request Oct 2, 2024
COMMITS:
360fea5 HDDS-11494. Improve the duration option of freon ombg (apache#7246)
10d3b21 HDDS-11504. Update Ratis to 3.1.1. (apache#7257)
ce46297 HDDS-11162. Improve Disk Usage page UI (apache#7214)
c91f1c7 HDDS-11491. Avoid sharing clientId among deleting services (apache#7250)
b0943d5 HDDS-11501. Improve logging in XceiverServerRatis (apache#7252)
55925ab HDDS-11502. Class path contains multiple SLF4J providers (apache#7255)
d0ad836 HDDS-11472. Avoid recreating external access authorizer on OM state reload (apache#7238)
254db9e HDDS-11500. RootCARotationManager cancelling wrong task in notifyStatusChanged (apache#7251)
1e6e4b3 HDDS-11499. Remove redundant code from ECReconstructionCoordinator. (apache#7248)
adb2821 HDDS-11490. Bump rollup to 3.29.5 (apache#7232)
189a9fe HDDS-11484. Validate javadoc in CI (apache#7245)
64a29c6 HDDS-11497. Bump commons-configuration2 to 2.11.0 (apache#7242)
95cfadd HDDS-11496. Bump maven-install-plugin to 3.1.3 (apache#7244)
0a999cf HDDS-11493. Bump sqlite-jdbc to 3.46.1.3 (apache#7243)
a214a31 HDDS-11329. Update Ozone images to Rocky Linux-based runner (apache#7241)
56ddb85 HDDS-11371. Handle cases where OM does not have getServerDefaults() implemented. (apache#7130)
b5097c7 HDDS-11347. Add rocks_tools_native lib check in Ozone CLI checknative subcommand (apache#7101)
fb0bf77 HDDS-11489. Bump maven-site-plugin to 3.20.0 (apache#7226)
70e6e40 HDDS-11122. Fix javadoc warnings (apache#7234)
acf3fdc HDDS-11458. Selective checks: trigger checkstyle for properties file changes (apache#7196)
6b87207 HDDS-11469. Statistics of Pipeline and Container (apache#7217)
1b8468b HDDS-11411. Snapshot garbage collection should not run when the keys are moved from a deleted snapshot to the next snapshot in the chain (apache#7193)
1f86ce8 HDDS-10617. Unexpected number of files in ITestS3AContractGetFileStatusV1List (apache#7208)
73a3bcc HDDS-11467. Bump vite to 4.5.5 (apache#7212)
d45aa1d HDDS-11460. Bump express to 4.21.0 (apache#7197)
e2e30b8 HDDS-11354. Intermittent failure in TestOzoneManagerSnapshotAcl#testLookupKeyWithNotAllowedUserForPrefixAcl (apache#7205)
0fcb645 HDDS-11477. [doc] Add configuration description for datanode docs (apache#7223)
3598ee3 HDDS-11464. Removed unused constants from OzoneConsts. (apache#7207)
8c0b54e HDDS-11408. Snapshot rename table entries are propagated incorrectly on snapshot deletes (apache#7200)
719bdf9 HDDS-11396. NPE due to empty Handler#clusterId (apache#7145)
40c4001 HDDS-10479. Add ozone admin ratis local raftMetaConf (apache#7170)
45f9138 HDDS-11394. Fix pipeline close --all command (apache#7138)
2b196d1 HDDS-11468. Enabled DB sync button (apache#7216)
d3899d2 Clean up files created after TestKeyValueHandlerWithUnhealthyContainer#testMarkContainerUnhealthyInFailedVolume (apache#7219)
70b8dd5 HDDS-11157. Improve Datanodes page UI (apache#7168)
151709a HDDS-11446. Downgrade picocli to 4.7.5 due to regression (apache#7215)
7a26aff HDDS-11158. Improve Pipelines page UI (apache#7171)
c365aa0 HDDS-11181. Cleanup of unnecessary try-catch blocks (apache#7210)
88dd436 HDDS-11423. Implement equals operation for --filter option to ozone ldb scan (apache#7167)
95cfadd HDDS-11496. Bump maven-install-plugin to 3.1.3 (apache#7244)
0a999cf HDDS-11493. Bump sqlite-jdbc to 3.46.1.3 (apache#7243)
a214a31 HDDS-11329. Update Ozone images to Rocky Linux-based runner (apache#7241)
56ddb85 HDDS-11371. Handle cases where OM does not have getServerDefaults() implemented. (apache#7130)
b5097c7 HDDS-11347. Add rocks_tools_native lib check in Ozone CLI checknative subcommand (apache#7101)
fb0bf77 HDDS-11489. Bump maven-site-plugin to 3.20.0 (apache#7226)
70e6e40 HDDS-11122. Fix javadoc warnings (apache#7234)
acf3fdc HDDS-11458. Selective checks: trigger checkstyle for properties file changes (apache#7196)
6b87207 HDDS-11469. Statistics of Pipeline and Container (apache#7217)
1b8468b HDDS-11411. Snapshot garbage collection should not run when the keys are moved from a deleted snaps
hot to the next snapshot in the chain (apache#7193)
1f86ce8 HDDS-10617. Unexpected number of files in ITestS3AContractGetFileStatusV1List (apache#7208)
73a3bcc HDDS-11467. Bump vite to 4.5.5 (apache#7212)
d45aa1d HDDS-11460. Bump express to 4.21.0 (apache#7197)
e2e30b8 HDDS-11354. Intermittent failure in TestOzoneManagerSnapshotAcl#testLookupKeyWithNotAllowedUserForP
refixAcl (apache#7205)
0fcb645 HDDS-11477. [doc] Add configuration description for datanode docs (apache#7223)
3598ee3 HDDS-11464. Removed unused constants from OzoneConsts. (apache#7207)
8c0b54e HDDS-11408. Snapshot rename table entries are propagated incorrectly on snapshot deletes (apache#7200)
719bdf9 HDDS-11396. NPE due to empty Handler#clusterId (apache#7145)
40c4001 HDDS-10479. Add ozone admin ratis local raftMetaConf (apache#7170)
45f9138 HDDS-11394. Fix pipeline close --all command (apache#7138)
2b196d1 HDDS-11468. Enabled DB sync button (apache#7216)
d3899d2 Clean up files created after TestKeyValueHandlerWithUnhealthyContainer#testMarkContainerUnhealthyIn
FailedVolume (apache#7219)
70b8dd5 HDDS-11157. Improve Datanodes page UI (apache#7168)
151709a HDDS-11446. Downgrade picocli to 4.7.5 due to regression (apache#7215)
7a26aff HDDS-11158. Improve Pipelines page UI (apache#7171)
c365aa0 HDDS-11181. Cleanup of unnecessary try-catch blocks (apache#7210)
88dd436 HDDS-11423. Implement equals operation for --filter option to ozone ldb scan (apache#7167)
e0060a8 HDDS-11196. Improve SCM WebUI Display (apache#6960)
22ddfb9 Revert "HDDS-11456. Require successful dependency/licence checks for acceptance/compile/kubernetes (apache#7192)"
9f5bf43 HDDS-11457. Internal error on S3 CompleteMultipartUpload if parts are not specified (apache#7195)
10c47a1 HDDS-11459. Bump develocity-maven-extension to 1.22.1 (apache#7201)
50f2563 HDDS-11419. Fix waitForCheckpointDirectoryExist log message (apache#7199)
a7d7e37 HDDS-11456. Require successful dependency/licence checks for acceptance/compile/kubernetes (apache#7192)
5feb9ea HDDS-11453. OmSnapshotPurge should be in a different ozone manager double buffer batch (apache#7188)
703c4d5 HDDS-10984. Tool to restore SCM certificates from RocksDB. (apache#6781)
d221065 HDDS-11440. Add a lastTransactionInfo field in SnapshotInfo to check for transactions in flight on the snapshot (apache#7179)
e573701 HDDS-11448. Improve documentation in ContainerStateMachine (apache#7183)
0e49f7a HDDS-11449. Remove unnecessary log from client console. (apache#7184)
cd251f2 HDDS-11438. Ensure DataInputBuffer is closed in OMPBHelper#convert (apache#7182)
4b47812 HDDS-11389. Incorrect number of deleted containers shown in Recon UI. (apache#7149)
0915f0b HDDS-10985. EC Reconstruction failed because the size of currentChunks was not equal to checksumBlockDataChunks. (apache#7009)
0f16195 HDDS-11416. refactor ratis submit request avoid code duplicate (apache#7166)
86fe920 HDDS-11376. Improve ReplicationSupervisor to record replication metrics (apache#7140)

CONFLICT:
Merge conflict in hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/keyvalue/TestKeyValueHandlerWithUnhealthyContainer.java

MODIFIED:
/Users/abalasubramanian/Documents/ozone/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/DNContainerOperationClient.java
/Users/abalasubramanian/Documents/ozone/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/ReconcileContainerTask.java
sarvekshayr added a commit to sarvekshayr/ozone that referenced this pull request Oct 7, 2024
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.

5 participants