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.

Sign up for GitHub

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

Jump to bottom

HDDS-7149. Update ratis version to 2.4.0 and thirdparty version to 1.0.2. #3855

Merged
merged 11 commits into from
Oct 19, 2022
Merged

HDDS-7149. Update ratis version to 2.4.0 and thirdparty version to 1.0.2. #3855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ab791ad
update ratis to 2.4.0
captainzmc Aug 29, 2022
a48922e
test ratis rc2
captainzmc Sep 1, 2022
da7c887
set orgapacheratis-1118
captainzmc Sep 21, 2022
ecfe404
set orgapacheratis-1118
captainzmc Sep 21, 2022
fd1908b
Fix UT
captainzmc Sep 30, 2022
b30be41
Fix checkstyle
captainzmc Sep 30, 2022
e09198c
Fix OM UT
captainzmc Sep 30, 2022
af4d00d
Fix clinet UT
captainzmc Sep 30, 2022
75f8382
set orgapacheratis-1127
captainzmc Oct 3, 2022
8afa81b
set orgapacheratis-1129 test rc5
captainzmc Oct 11, 2022
641c03a
update ratis to released 2.4.0
captainzmc Oct 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMStateMachine.java
View file
Open in desktop
Expand Up @@ -353,8 +353,11 @@ public void notifyConfigurationChanged(long term, long index,

@Override
public void pause() {
getLifeCycle().transition(LifeCycle.State.PAUSING);
getLifeCycle().transition(LifeCycle.State.PAUSED);
final LifeCycle lc = getLifeCycle();
Copy link
Contributor

@myskov myskov Oct 18, 2022 •
edited

Choose a reason for hiding this comment

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

Are these changes related to bumping ratis version?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, the tests are failing otherwise.

https://github.com/adoroszlai/hadoop-ozone/actions/runs/3251786711/jobs/5337244145#step:5:3128
https://github.com/adoroszlai/hadoop-ozone/actions/runs/3251786711/jobs/5337244434#step:5:3141
https://github.com/adoroszlai/hadoop-ozone/actions/runs/3251786711/jobs/5337244713#step:6:3310

if (lc.getCurrentState() != LifeCycle.State.NEW) {
lc.transition(LifeCycle.State.PAUSING);
lc.transition(LifeCycle.State.PAUSED);
}
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...ion-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestValidateBCSIDOnRestart.java
View file
Open in desktop
Expand Up @@ -233,7 +233,7 @@ public void testValidateBCSIDOnDnRestart() throws Exception {
// in the and what is there in RockSDB and hence the container would be
// marked unhealthy
index = cluster.getHddsDatanodeIndex(dn.getDatanodeDetails());
cluster.restartHddsDatanode(dn.getDatanodeDetails(), false);
cluster.restartHddsDatanode(dn.getDatanodeDetails(), true);
// Make sure the container is marked unhealthy
Assert.assertTrue(
cluster.getHddsDatanodes().get(index)
Expand Down
5 changes: 4 additions & 1 deletion ...egration-test/src/test/java/org/apache/hadoop/ozone/scm/TestSCMInstallSnapshotWithHA.java
View file
Open in desktop
Expand Up @@ -51,6 +51,7 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

import org.apache.ratis.util.LifeCycle;
import org.junit.Assert;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
Expand Down Expand Up @@ -273,7 +274,9 @@ public void testInstallCorruptedCheckpointFailure() throws Exception {

Assert.assertTrue(logCapture.getOutput()
.contains("Failed to reload SCM state and instantiate services."));
Assert.assertTrue(followerSM.getLifeCycleState().isPausingOrPaused());
final LifeCycle.State s = followerSM.getLifeCycleState();
Assert.assertTrue("Unexpected lifeCycle state: " + s,
s == LifeCycle.State.NEW || s.isPausingOrPaused());

// Verify correct reloading
followerSM.setInstallingDBCheckpoint(
Expand Down
8 changes: 6 additions & 2 deletions ...zone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerStateMachine.java
View file
Open in desktop
Expand Up @@ -391,8 +391,12 @@ public synchronized void pause() {
if (getLifeCycleState() == LifeCycle.State.PAUSED) {
return;
}
getLifeCycle().transition(LifeCycle.State.PAUSING);
getLifeCycle().transition(LifeCycle.State.PAUSED);
final LifeCycle lc = getLifeCycle();
if (lc.getCurrentState() != LifeCycle.State.NEW) {
getLifeCycle().transition(LifeCycle.State.PAUSING);
getLifeCycle().transition(LifeCycle.State.PAUSED);
}

ozoneManagerDoubleBuffer.stop();
}

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Expand Up @@ -73,10 +73,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<declared.ozone.version>${ozone.version}</declared.ozone.version>

<!-- Apache Ratis version -->
<ratis.version>2.3.0</ratis.version>
<ratis.version>2.4.0</ratis.version>

<!-- Apache Ratis thirdparty version -->
<ratis.thirdparty.version>1.0.0</ratis.thirdparty.version>
<ratis.thirdparty.version>1.0.2</ratis.thirdparty.version>

<!-- Apache Ranger plugin version -->
<ranger.version>2.3.0</ranger.version>
Expand Down