sijie closed pull request #2240: remove redundant endpoint to get workers in
cluster
URL: https://github.com/apache/incubator-pulsar/pull/2240
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java
index 16d82525c0..564eb18067 100644
---
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java
+++
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/FunctionsBase.java
@@ -209,7 +209,8 @@ public Response listFunctions(final @PathParam("tenant")
String tenant,
})
@Path("/cluster")
- public Response getCluster() {
+ @Produces(MediaType.APPLICATION_JSON)
+ public List<WorkerInfo> getCluster() {
return functions.getCluster();
}
@@ -302,14 +303,4 @@ public Response downloadFunction(final @QueryParam("path")
String path) {
public List<ConnectorDefinition> getConnectorsList() throws IOException {
return functions.getListOfConnectors();
}
-
- @GET
- @Path("/workers")
- @ApiOperation(value = "Get all current member workers.")
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- public List<WorkerInfo> getWorkers() {
- return functions.getWorkers();
- }
-
}
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java
index 537c1c8780..427976ff5d 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/io/PulsarFunctionAdminTest.java
@@ -212,7 +212,7 @@ private WorkerService
createPulsarFunctionWorker(ServiceConfiguration config) {
@Test
public void testGetWokersApi() throws Exception {
- List<WorkerInfo> workers = admin.functions().getWorkers();
+ List<WorkerInfo> workers = admin.functions().getCluster();
Assert.assertEquals(workers.size(), 1);
Assert.assertEquals(workers.get(0).getPort(), workerServicePort);
}
diff --git
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Functions.java
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Functions.java
index 72e9628a6b..293304f00f 100644
---
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Functions.java
+++
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/Functions.java
@@ -258,5 +258,5 @@
* @return
* @throws PulsarAdminException
*/
- List<WorkerInfo> getWorkers() throws PulsarAdminException;
+ List<WorkerInfo> getCluster() throws PulsarAdminException;
}
diff --git
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
index 35393ff75a..fdb3588e40 100644
---
a/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
+++
b/pulsar-client-admin/src/main/java/org/apache/pulsar/client/admin/internal/FunctionsImpl.java
@@ -273,9 +273,9 @@ public void downloadFunction(String destinationPath, String
path) throws PulsarA
.map(ConnectorDefinition::getName).collect(Collectors.toSet());
}
- public List<WorkerInfo> getWorkers() throws PulsarAdminException {
+ public List<WorkerInfo> getCluster() throws PulsarAdminException {
try {
- return request(functions.path("workers")).get(new
GenericType<List<WorkerInfo>>() {
+ return request(functions.path("cluster")).get(new
GenericType<List<WorkerInfo>>() {
});
} catch (Exception e) {
throw getApiException(e);
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
index 2a38c81f93..3092fd7ede 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdFunctions.java
@@ -107,7 +107,7 @@
private final TriggerFunction triggerer;
private final UploadFunction uploader;
private final DownloadFunction downloader;
- private final GetWorkers workers;
+ private final GetCluster cluster;
/**
* Base command
@@ -888,11 +888,11 @@ void runCmd() throws Exception {
}
}
- @Parameters(commandDescription = "Get list of workers registered into
cluster")
- class GetWorkers extends BaseCommand {
+ @Parameters(commandDescription = "Get list of workers registered in
cluster")
+ class GetCluster extends BaseCommand {
@Override
void runCmd() throws Exception {
- String json = (new Gson()).toJson(admin.functions().getWorkers());
+ String json = (new Gson()).toJson(admin.functions().getCluster());
Gson gson = new GsonBuilder().setPrettyPrinting().create();
System.out.println(gson.toJson(new JsonParser().parse(json)));
}
@@ -911,7 +911,7 @@ public CmdFunctions(PulsarAdmin admin) throws
PulsarClientException {
triggerer = new TriggerFunction();
uploader = new UploadFunction();
downloader = new DownloadFunction();
- workers = new GetWorkers();
+ cluster = new GetCluster();
jcommander.addCommand("localrun", getLocalRunner());
jcommander.addCommand("create", getCreater());
jcommander.addCommand("delete", getDeleter());
@@ -923,7 +923,7 @@ public CmdFunctions(PulsarAdmin admin) throws
PulsarClientException {
jcommander.addCommand("trigger", getTriggerer());
jcommander.addCommand("upload", getUploader());
jcommander.addCommand("download", getDownloader());
- jcommander.addCommand("workers", workers);
+ jcommander.addCommand("cluster", cluster);
}
@VisibleForTesting
diff --git
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
index 9b0ad98b27..e590b0ee24 100644
---
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
+++
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/FunctionsImpl.java
@@ -488,7 +488,7 @@ private Response updateRequest(FunctionMetaData
functionMetaData) {
return this.worker().getConnectorsManager().getConnectors();
}
- public List<WorkerInfo> getWorkers() {
+ public List<WorkerInfo> getCluster() {
if (!isWorkerServiceAvailable()) {
throw new WebApplicationException(
Response.status(Status.SERVICE_UNAVAILABLE).type(MediaType.APPLICATION_JSON)
@@ -497,17 +497,6 @@ private Response updateRequest(FunctionMetaData
functionMetaData) {
return worker().getMembershipManager().getCurrentMembership();
}
- public Response getCluster() {
-
- if (!isWorkerServiceAvailable()) {
- return getUnavailableResponse();
- }
-
- MembershipManager membershipManager = worker().getMembershipManager();
- List<WorkerInfo> members = membershipManager.getCurrentMembership();
- return Response.status(Status.OK).entity(new
Gson().toJson(members)).build();
- }
-
public WorkerInfo getClusterLeader() {
if (!isWorkerServiceAvailable()) {
throw new WebApplicationException(
diff --git
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2Resource.java
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2Resource.java
index a44284aa6f..96baada967 100644
---
a/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2Resource.java
+++
b/pulsar-functions/worker/src/main/java/org/apache/pulsar/functions/worker/rest/api/v2/FunctionApiV2Resource.java
@@ -131,7 +131,9 @@ public Response listFunctions(final @PathParam("tenant")
String tenant,
@GET
@Path("/cluster")
- public Response getCluster() {
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Fetches information about the Pulsar cluster
running Pulsar Functions")
+ public List<WorkerInfo> getCluster() {
return functions.getCluster();
}
@@ -179,14 +181,4 @@ public Response downloadFunction(final @QueryParam("path")
String path) {
public List<ConnectorDefinition> getConnectorsList() throws IOException {
return functions.getListOfConnectors();
}
-
- @GET
- @Path("/workers")
- @ApiOperation(value = "Get all current member workers.")
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- public List<WorkerInfo> getWorkers() {
- return functions.getWorkers();
- }
-
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
