Skip to content

HDDS-3654. Let backgroundCreator create pipeline for the support replication factors alternately #984

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

Merged
elek merged 5 commits into from
Aug 25, 2020
Merged

HDDS-3654. Let backgroundCreator create pipeline for the support replication factors alternately #984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc4e0d7
HDDS-3654. Let backgroundCreator create pipeline for the support repl…
maobaolong May 28, 2020
2f1cf7d
Merge remote-tracking branch 'origin/master' into HEAD
elek Jul 27, 2020
42bac55
retrigger build with empty commit
elek Jul 27, 2020
ef85fd3
Merge remote-tracking branch 'origin/master' into HEAD
elek Aug 7, 2020
42f6948
Fix ut
maobaolong Aug 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions ...rver-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/BackgroundPipelineCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package org.apache.hadoop.hdds.scm.pipeline;

import org.apache.commons.collections.iterators.LoopingIterator;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.scm.ScmConfigKeys;
Expand All @@ -26,6 +27,8 @@
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
Expand Down Expand Up @@ -109,35 +112,43 @@ private void createPipelines() {
ScmConfigKeys.OZONE_SCM_PIPELINE_AUTO_CREATE_FACTOR_ONE,
ScmConfigKeys.OZONE_SCM_PIPELINE_AUTO_CREATE_FACTOR_ONE_DEFAULT);

List<HddsProtos.ReplicationFactor> list =
new ArrayList<>();
for (HddsProtos.ReplicationFactor factor : HddsProtos.ReplicationFactor
.values()) {
if (skipCreation(factor, type, autoCreateFactorOne)) {
// Skip this iteration for creating pipeline
continue;
}

list.add(factor);
if (!pipelineManager.getSafeModeStatus()) {
try {
pipelineManager.scrubPipeline(type, factor);
} catch (IOException e) {
LOG.error("Error while scrubbing pipelines {}", e);
}
}
}

while (true) {
try {
if (scheduler.isClosed()) {
break;
}
pipelineManager.createPipeline(type, factor);
} catch (IOException ioe) {
break;
} catch (Throwable t) {
LOG.error("Error while creating pipelines", t);
LoopingIterator it = new LoopingIterator(list);
while (it.hasNext()) {
HddsProtos.ReplicationFactor factor =
(HddsProtos.ReplicationFactor) it.next();

try {
if (scheduler.isClosed()) {
break;
}
pipelineManager.createPipeline(type, factor);
} catch (IOException ioe) {
it.remove();
} catch (Throwable t) {
LOG.error("Error while creating pipelines", t);
it.remove();
}
}

isPipelineCreatorRunning.set(false);
LOG.debug("BackgroundPipelineCreator createPipelines finished.");
}
}
5 changes: 4 additions & 1 deletion ...op-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/node/TestDeadNodeHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package org.apache.hadoop.hdds.scm.node;

import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.THREE;
import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.ONE;
import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType.RATIS;

import java.io.File;
Expand Down Expand Up @@ -162,7 +163,9 @@ public void testOnMessage() throws Exception {
LambdaTestUtils.await(120000, 1000,
() -> {
pipelineManager.triggerPipelineCreation();
return pipelineManager.getPipelines(RATIS, THREE).size() == 3;
System.out.println(pipelineManager.getPipelines(RATIS, THREE).size());
System.out.println(pipelineManager.getPipelines(RATIS, ONE).size());
return pipelineManager.getPipelines(RATIS, THREE).size() > 3;
});
TestUtils.openAllRatisPipelines(pipelineManager);

Expand Down