anuragp010 opened a new pull request, #11448:
URL: https://github.com/apache/ozone/pull/11448
## What changes were proposed in this pull request?
This PR is to enable a review for merging latest master changes from master
into HDDS-11233 - storage policy feature branch.
Conflicts resolved:
1. `AbstractS3SDKV2Tests.java`:
**Conflict:**` import org.apache.hadoop.hdds.conf.OzoneConfiguration;` was
added by master on the line above a removed `import
org.apache.hadoop.hdds.protocol.StorageType;` by the feature branch .
**Resolution:** This was resolved by ensuring `StorageType` import remains
removed and the `OzoneConfiguration` import is added.
2. `BlockID.java`:
- **Conflict:** `import org.apache.hadoop.fs.StorageType;` was added by the
feature branch on top of a change which changed the import `import
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;` to `import
org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.DatanodeBlockID;`
in master.
**Resolution:** the `StorageType` import was added and the
`DatanodeBlockID` import from master was kept.
- **Conflict:** An upstream commit changed `ContainerProtos.DatanodeBlockID`
to `DatanodeBlockID` in the return type of `getDatanodeBlockIDProtobuf` and the
params of `getFromProtobuf` , along with invoking
`getDatanodeBlockIDProtobufBuilder(replicaIndex)` while the feature branch
added `StorageType` related changes to those methods.
**Resolution:** The upstream changes were kept intact and `StorageType`
specific changes included.
3. `BlockOutputStream.java`:
**Conflict:** In the constructor `getDatanodeBlockIDProtobufBuilder` was
used to get rid of the `ContainerProtos.DatanodeBlockID.Builder blkIDBuilder`
code in master. Whereas the feature branch, was setting the `StorageType` in
the `blkIdBuilder` to - `DISK` .
**Resolution:** `getDatanodeBlockIDProtobufBuilder` was overloaded with
`storageTypeId` as a param, so the retrieved `BockID` contains the required
`storageTypeId`, when `storageTypeId` is passed as an argument.
4. `ContainerProtocolCalls.java`:
**Conflict:** `getDatanodeBlockID` was removed and all it's usages were
replaced with `getDatanodeBlockIDProtobufBuilder(replicaIndex)` by a commit in
master. But the storage policy feature branch added an overload of
`getDatanodeBlockId` with `HddsProtos.StorageTypeProto` as a function
parameter.
**Resolution:** The newly added
`getDatanodeBlockIDProtobufBuilder(replicaIndex, storageTypeId)` was used.
5. `Pipeline.java:`
**Conflict:** `import java.util.function.Function;` and `import
java.util.stream.Collectors;` imports were removed in master and feature branch
added imports `import java.util.concurrent.locks.ReadWriteLock;` and `import
java.util.concurrent.locks.ReentrantReadWriteLock;`.
**Resolution:** Removed the imports removed in master while keeping the
`ReadWriteLock` and `ReentrantReadWriteLock` imports added in the feature
branch.
6. `TestCleanupTableInfo.java:`
**Conflict:** This test was removed in master, whereas the feature branch
had recent commits which removed the usage of StorageType in the test.
**Resolution:** The test was removed consistent with master.
7. `TestKeyValueHandler.java:`
**Conflict:** `readBlock` method was replaced with the `StreamFixture` class
in master. The conflict arose as the feature branch passed `null` `StorageType`
in `container.create` , which was not present in the master.
**Resolution:** The `container.create` method invocation was updated to pass
null StorageType.
8. `TestMiniOzoneCluster.java:`
**Conflict:** Minor conflict due to an addition of the `import
org.apache.hadoop.conf.Configuration;` in master on the same line on which
`StorageType` import was added by the feature branch.
**Resolution:** The `Configuration` import was added while keeping the
`StorageType` import.
9. Additional build failures were addressed as part of the commit:
https://github.com/apache/ozone/commit/96cb1a6ca40f901b4db715a13703d0bbd2544ffa
## What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-16116
## How was this patch tested?
1. CI run.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
