Skip to content

Conversation

@elek
Copy link
Member

@elek elek commented May 3, 2021

What changes were proposed in this pull request?

HDDS-5047 / #2096 started to use ReplicationConfig in Pipeline and pipeline related SCM service on master. ReplicationConfig was introduced in HDDS-5011, but it has two versions one for master #(2089) and one for the EC branch.(#2068)

Merging master after HDDS-5047 requires small modification in the code to make HDDS-5047 compatible the ec version of HDDS-5011:

During the proto serialization / deserialization we should use optional ECReplicationConfig (if exists).

What is the link to the Apache JIRA

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

How was this patch tested?

With CI, The EC branch has compilation failure without this patch.

@elek elek requested a review from sodonnel May 3, 2021 08:18
@elek elek changed the base branch from master to HDDS-3816-ec May 3, 2021 08:19
Copy link
Contributor

@sodonnel sodonnel left a comment

Choose a reason for hiding this comment

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

Changes LGTM. Thanks for fixing this.

@sodonnel sodonnel merged commit 1d5c593 into apache:HDDS-3816-ec May 4, 2021
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.

2 participants