diff --git a/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java b/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java index ca2e1927f4b13..ee4c94f878b7e 100644 --- a/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java +++ b/flink-clients/src/test/java/org/apache/flink/client/program/rest/RestClusterClientTest.java @@ -1255,13 +1255,14 @@ void testJobDetailsContainsSlotSharingGroupId() throws Exception { new JobDetailsInfo.JobVertexDetailsInfo( new JobVertexID(), slotSharingGroupId, + null, "jobVertex1", 2, 1, ExecutionState.RUNNING, - 1, - 2, - 1, + 1L, + 2L, + 1L, Collections.singletonMap(ExecutionState.RUNNING, 0), jobVertexMetrics)); final JobDetailsInfo jobDetailsInfo = diff --git a/flink-runtime-web/src/test/resources/rest_api_v1.snapshot b/flink-runtime-web/src/test/resources/rest_api_v1.snapshot index 38cafeea1b9a2..a1a8edae1693f 100644 --- a/flink-runtime-web/src/test/resources/rest_api_v1.snapshot +++ b/flink-runtime-web/src/test/resources/rest_api_v1.snapshot @@ -169,38 +169,6 @@ "type" : "object", "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyResponseBody" } - }, { - "url" : "/applications/:applicationid/jobmanager/config", - "method" : "GET", - "status-code" : "200 OK", - "file-upload" : false, - "path-parameters" : { - "pathParameters" : [ { - "key" : "applicationid" - } ] - }, - "query-parameters" : { - "queryParameters" : [ ] - }, - "request" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody" - }, - "response" : { - "type" : "array", - "items" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:ConfigurationInfoEntry", - "properties" : { - "key" : { - "type" : "string" - }, - "value" : { - "type" : "string" - } - } - } - } }, { "url" : "/applications/:applicationid/exceptions", "method" : "GET", @@ -251,6 +219,38 @@ } } } + }, { + "url" : "/applications/:applicationid/jobmanager/config", + "method" : "GET", + "status-code" : "200 OK", + "file-upload" : false, + "path-parameters" : { + "pathParameters" : [ { + "key" : "applicationid" + } ] + }, + "query-parameters" : { + "queryParameters" : [ ] + }, + "request" : { + "type" : "object", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody" + }, + "response" : { + "type" : "array", + "items" : { + "type" : "object", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:ConfigurationInfoEntry", + "properties" : { + "key" : { + "type" : "string" + }, + "value" : { + "type" : "string" + } + } + } + } }, { "url" : "/cluster", "method" : "DELETE", @@ -1370,6 +1370,9 @@ "slotSharingGroupId" : { "type" : "any" }, + "slotSharingGroupName" : { + "type" : "string" + }, "name" : { "type" : "string" }, @@ -2834,6 +2837,57 @@ } } } + }, { + "url" : "/jobs/:jobid/rescales/config", + "method" : "GET", + "status-code" : "200 OK", + "file-upload" : false, + "path-parameters" : { + "pathParameters" : [ { + "key" : "jobid" + } ] + }, + "query-parameters" : { + "queryParameters" : [ ] + }, + "request" : { + "type" : "object", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody" + }, + "response" : { + "type" : "object", + "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:job:rescales:JobRescaleConfigInfo", + "properties" : { + "rescaleHistoryMax" : { + "type" : "integer" + }, + "schedulerExecutionMode" : { + "type" : "string", + "enum" : [ "REACTIVE" ] + }, + "submissionResourceWaitTimeoutInMillis" : { + "type" : "integer" + }, + "submissionResourceStabilizationTimeoutInMillis" : { + "type" : "integer" + }, + "slotIdleTimeoutInMillis" : { + "type" : "integer" + }, + "executingCooldownTimeoutInMillis" : { + "type" : "integer" + }, + "executingResourceStabilizationTimeoutInMillis" : { + "type" : "integer" + }, + "maximumDelayForTriggeringRescaleInMillis" : { + "type" : "integer" + }, + "rescaleOnFailedCheckpointCount" : { + "type" : "integer" + } + } + } }, { "url" : "/jobs/:jobid/rescaling", "method" : "PATCH", @@ -4781,56 +4835,5 @@ } } } - }, { - "url" : "/jobs/:jobid/rescales/config", - "method" : "GET", - "status-code" : "200 OK", - "file-upload" : false, - "path-parameters" : { - "pathParameters" : [ { - "key" : "jobid" - } ] - }, - "query-parameters" : { - "queryParameters" : [ ] - }, - "request" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody" - }, - "response" : { - "type" : "object", - "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:job:rescales:JobRescaleConfigInfo", - "properties" : { - "executingCooldownTimeoutInMillis" : { - "type" : "integer" - }, - "executingResourceStabilizationTimeoutInMillis" : { - "type" : "integer" - }, - "maximumDelayForTriggeringRescaleInMillis" : { - "type" : "integer" - }, - "rescaleHistoryMax" : { - "type" : "integer" - }, - "rescaleOnFailedCheckpointCount" : { - "type" : "integer" - }, - "schedulerExecutionMode" : { - "type" : "string", - "enum" : [ "REACTIVE" ] - }, - "slotIdleTimeoutInMillis" : { - "type" : "integer" - }, - "submissionResourceStabilizationTimeoutInMillis" : { - "type" : "integer" - }, - "submissionResourceWaitTimeoutInMillis" : { - "type" : "integer" - } - } - } } ] -} +} \ No newline at end of file diff --git a/flink-runtime-web/web-dashboard/src/app/components/dagre/components/node/node.component.html b/flink-runtime-web/web-dashboard/src/app/components/dagre/components/node/node.component.html index 30e225f63e472..5ef06ad2d6492 100644 --- a/flink-runtime-web/web-dashboard/src/app/components/dagre/components/node/node.component.html +++ b/flink-runtime-web/web-dashboard/src/app/components/dagre/components/node/node.component.html @@ -33,6 +33,9 @@

{{ operator }} {{ description }} Parallelism: {{ parallelism }} + + Slot Sharing Group: {{ slotSharingGroupName }} +