Skip to content

HDDS-2650 Fix createPipeline and make createPipeline CLI message based. #370

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
ChenSammi merged 1 commit into from
Dec 18, 2019
Merged

HDDS-2650 Fix createPipeline and make createPipeline CLI message based. #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions ...ache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocolServerSideTranslatorPB.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.PipelineResponseProto;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.ActivatePipelineRequestProto;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.ActivatePipelineResponseProto;
import org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.ClosePipelineRequestProto;
Expand Down Expand Up @@ -70,6 +71,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.PipelineResponseProto.Error.errorPipelineAlreadyExists;
import static org.apache.hadoop.hdds.protocol.proto.StorageContainerLocationProtocolProtos.PipelineResponseProto.Error.success;

/**
* This class is the server-side translator that forwards requests received on
* {@link StorageContainerLocationProtocolPB} to the
Expand Down Expand Up @@ -158,6 +162,12 @@ public ScmContainerLocationResponse processRequest(
.setScmCloseContainerResponse(closeContainer(
request.getScmCloseContainerRequest()))
.build();
case AllocatePipeline:
return ScmContainerLocationResponse.newBuilder()
.setCmdType(request.getCmdType())
.setStatus(Status.OK)
.setPipelineResponse(allocatePipeline(request.getPipelineRequest()))
.build();
case ListPipelines:
return ScmContainerLocationResponse.newBuilder()
.setCmdType(request.getCmdType())
Expand Down Expand Up @@ -318,6 +328,22 @@ public SCMCloseContainerResponseProto closeContainer(
return SCMCloseContainerResponseProto.newBuilder().build();
}

public PipelineResponseProto allocatePipeline(
StorageContainerLocationProtocolProtos.PipelineRequestProto request)
throws IOException {
Pipeline pipeline = impl.createReplicationPipeline(
request.getReplicationType(), request.getReplicationFactor(),
HddsProtos.NodePool.getDefaultInstance());
if (pipeline == null) {
return PipelineResponseProto.newBuilder()
.setErrorCode(errorPipelineAlreadyExists).build();
}
PipelineResponseProto response = PipelineResponseProto.newBuilder()
.setErrorCode(success)
.setPipeline(pipeline.getProtobufMessage()).build();
return response;
}

public ListPipelineResponseProto listPipelines(
ListPipelineRequestProto request)
throws IOException {
Expand Down
7 changes: 3 additions & 4 deletions ...tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/CreatePipelineSubcommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.hdds.scm.cli.SCMCLI;
import org.apache.hadoop.hdds.scm.client.ScmClient;
import picocli.CommandLine;

Expand All @@ -30,13 +29,13 @@
* Handler of createPipeline command.
*/
@CommandLine.Command(
name = "createPipeline",
name = "create",
description = "create pipeline",
mixinStandardHelpOptions = true,
versionProvider = HddsVersionProvider.class)
public class CreatePipelineSubcommand implements Callable<Void> {
@CommandLine.ParentCommand
private SCMCLI parent;
private PipelineCommands parent;

@CommandLine.Option(
names = {"-t", "--replicationType"},
Expand All @@ -60,7 +59,7 @@ public Void call() throws Exception {
throw new IllegalArgumentException(type.name()
+ " is not supported yet.");
}
try (ScmClient scmClient = parent.createScmClient()) {
try (ScmClient scmClient = parent.getParent().createScmClient()) {
scmClient.createReplicationPipeline(
type,
factor,
Expand Down