You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2018/10/25 20:43:06 UTC
[GitHub] jerrypeng closed pull request #2841: Set function resources properly
jerrypeng closed pull request #2841: Set function resources properly
URL: https://github.com/apache/pulsar/pull/2841
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-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
index 4f30bf1e50..7cd870f519 100644
--- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
+++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/CmdFunctionsTest.java
@@ -811,6 +811,193 @@ public void TestCreateClassName() throws Exception {
testValidateFunctionsConfigs(correctArgs, incorrectArgs, "User class must be in class path");
}
+ @Test
+ public void testCreateFunctionWithCpu() throws Exception {
+ String fnName = TEST_NAME + "-function";
+ String inputTopicName = TEST_NAME + "-input-topic";
+ String outputTopicName = TEST_NAME + "-output-topic";
+
+ final String url = "file:" + JAR_NAME;
+ cmd.run(new String[] {
+ "create",
+ "--name", fnName,
+ "--inputs", inputTopicName,
+ "--output", outputTopicName,
+ "--jar", url,
+ "--tenant", "sample",
+ "--namespace", "ns1",
+ "--className", DummyFunction.class.getName(),
+ "--cpu", "5.0"
+ });
+
+ CreateFunction creater = cmd.getCreater();
+
+ assertEquals(fnName, creater.getFunctionName());
+ assertEquals(inputTopicName, creater.getInputs());
+ assertEquals(outputTopicName, creater.getOutput());
+ assertEquals(creater.getFunctionConfig().getResources().getCpu(), 5.0);
+ // Disk/Ram should be default
+ assertEquals(creater.getFunctionConfig().getResources().getRam(), new Long(1073741824l));
+ assertEquals(creater.getFunctionConfig().getResources().getDisk(), new Long(10737418240l));
+ verify(functions, times(1)).createFunctionWithUrl(any(FunctionConfig.class), anyString());
+ }
+
+ @Test
+ public void testCreateFunctionWithRam() throws Exception {
+ String fnName = TEST_NAME + "-function";
+ String inputTopicName = TEST_NAME + "-input-topic";
+ String outputTopicName = TEST_NAME + "-output-topic";
+
+ final String url = "file:" + JAR_NAME;
+ cmd.run(new String[] {
+ "create",
+ "--name", fnName,
+ "--inputs", inputTopicName,
+ "--output", outputTopicName,
+ "--jar", url,
+ "--tenant", "sample",
+ "--namespace", "ns1",
+ "--className", DummyFunction.class.getName(),
+ "--ram", "5656565656"
+ });
+
+ CreateFunction creater = cmd.getCreater();
+
+ assertEquals(fnName, creater.getFunctionName());
+ assertEquals(inputTopicName, creater.getInputs());
+ assertEquals(outputTopicName, creater.getOutput());
+ assertEquals(creater.getFunctionConfig().getResources().getRam(), new Long(5656565656l));
+ // cpu/disk should be default
+ assertEquals(creater.getFunctionConfig().getResources().getCpu(), 1.0);
+ assertEquals(creater.getFunctionConfig().getResources().getDisk(), new Long(10737418240l));
+ verify(functions, times(1)).createFunctionWithUrl(any(FunctionConfig.class), anyString());
+ }
+
+ @Test
+ public void testCreateFunctionWithDisk() throws Exception {
+ String fnName = TEST_NAME + "-function";
+ String inputTopicName = TEST_NAME + "-input-topic";
+ String outputTopicName = TEST_NAME + "-output-topic";
+
+ final String url = "file:" + JAR_NAME;
+ cmd.run(new String[] {
+ "create",
+ "--name", fnName,
+ "--inputs", inputTopicName,
+ "--output", outputTopicName,
+ "--jar", url,
+ "--tenant", "sample",
+ "--namespace", "ns1",
+ "--className", DummyFunction.class.getName(),
+ "--disk", "8080808080808080"
+ });
+
+ CreateFunction creater = cmd.getCreater();
+
+ assertEquals(fnName, creater.getFunctionName());
+ assertEquals(inputTopicName, creater.getInputs());
+ assertEquals(outputTopicName, creater.getOutput());
+ assertEquals(creater.getFunctionConfig().getResources().getDisk(), new Long(8080808080808080l));
+ // cpu/Ram should be default
+ assertEquals(creater.getFunctionConfig().getResources().getRam(), new Long(1073741824l));
+ assertEquals(creater.getFunctionConfig().getResources().getCpu(), 1.0);
+ verify(functions, times(1)).createFunctionWithUrl(any(FunctionConfig.class), anyString());
+ }
+
+
+ @Test
+ public void testUpdateFunctionWithCpu() throws Exception {
+ String fnName = TEST_NAME + "-function";
+ String inputTopicName = TEST_NAME + "-input-topic";
+ String outputTopicName = TEST_NAME + "-output-topic";
+
+ final String url = "file:" + JAR_NAME;
+ cmd.run(new String[] {
+ "update",
+ "--name", fnName,
+ "--inputs", inputTopicName,
+ "--output", outputTopicName,
+ "--jar", url,
+ "--tenant", "sample",
+ "--namespace", "ns1",
+ "--className", DummyFunction.class.getName(),
+ "--cpu", "5.0"
+ });
+
+ UpdateFunction updater = cmd.getUpdater();
+
+ assertEquals(fnName, updater.getFunctionName());
+ assertEquals(inputTopicName, updater.getInputs());
+ assertEquals(outputTopicName, updater.getOutput());
+ assertEquals(updater.getFunctionConfig().getResources().getCpu(), 5.0);
+ // Disk/Ram should be default
+ assertEquals(updater.getFunctionConfig().getResources().getRam(), new Long(1073741824l));
+ assertEquals(updater.getFunctionConfig().getResources().getDisk(), new Long(10737418240l));
+ verify(functions, times(1)).updateFunctionWithUrl(any(FunctionConfig.class), anyString());
+ }
+
+ @Test
+ public void testUpdateFunctionWithRam() throws Exception {
+ String fnName = TEST_NAME + "-function";
+ String inputTopicName = TEST_NAME + "-input-topic";
+ String outputTopicName = TEST_NAME + "-output-topic";
+
+ final String url = "file:" + JAR_NAME;
+ cmd.run(new String[] {
+ "update",
+ "--name", fnName,
+ "--inputs", inputTopicName,
+ "--output", outputTopicName,
+ "--jar", url,
+ "--tenant", "sample",
+ "--namespace", "ns1",
+ "--className", DummyFunction.class.getName(),
+ "--ram", "5656565656"
+ });
+
+ UpdateFunction updater = cmd.getUpdater();
+
+ assertEquals(fnName, updater.getFunctionName());
+ assertEquals(inputTopicName, updater.getInputs());
+ assertEquals(outputTopicName, updater.getOutput());
+ assertEquals(updater.getFunctionConfig().getResources().getRam(), new Long(5656565656l));
+ // cpu/disk should be default
+ assertEquals(updater.getFunctionConfig().getResources().getCpu(), 1.0);
+ assertEquals(updater.getFunctionConfig().getResources().getDisk(), new Long(10737418240l));
+ verify(functions, times(1)).updateFunctionWithUrl(any(FunctionConfig.class), anyString());
+ }
+
+ @Test
+ public void testUpdateFunctionWithDisk() throws Exception {
+ String fnName = TEST_NAME + "-function";
+ String inputTopicName = TEST_NAME + "-input-topic";
+ String outputTopicName = TEST_NAME + "-output-topic";
+
+ final String url = "file:" + JAR_NAME;
+ cmd.run(new String[] {
+ "update",
+ "--name", fnName,
+ "--inputs", inputTopicName,
+ "--output", outputTopicName,
+ "--jar", url,
+ "--tenant", "sample",
+ "--namespace", "ns1",
+ "--className", DummyFunction.class.getName(),
+ "--disk", "8080808080808080"
+ });
+
+ UpdateFunction updater = cmd.getUpdater();
+
+ assertEquals(fnName, updater.getFunctionName());
+ assertEquals(inputTopicName, updater.getInputs());
+ assertEquals(outputTopicName, updater.getOutput());
+ assertEquals(updater.getFunctionConfig().getResources().getDisk(), new Long(8080808080808080l));
+ // cpu/Ram should be default
+ assertEquals(updater.getFunctionConfig().getResources().getRam(), new Long(1073741824l));
+ assertEquals(updater.getFunctionConfig().getResources().getCpu(), 1.0);
+ verify(functions, times(1)).updateFunctionWithUrl(any(FunctionConfig.class), anyString());
+ }
+
@Test
public void TestCreateSameInOutTopic() throws Exception {
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 7564d32aa8..a75092c796 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
@@ -414,7 +414,22 @@ void processArguments() throws Exception {
functionConfig.setParallelism(parallelism);
}
- functionConfig.setResources(new Resources(cpu, ram, disk));
+ Resources resources = functionConfig.getResources();
+ if (resources == null) {
+ resources = new Resources();
+ }
+ if (cpu != null) {
+ resources.setCpu(cpu);
+ }
+
+ if (ram != null) {
+ resources.setRam(ram);
+ }
+
+ if (disk != null) {
+ resources.setDisk(disk);
+ }
+ functionConfig.setResources(resources);
if (timeoutMs != null) {
functionConfig.setTimeoutMs(timeoutMs);
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services