From 4d92e012a82f5748bc79e511977c092e941b16aa Mon Sep 17 00:00:00 2001 From: Anwar Hidayat Date: Fri, 3 Dec 2021 09:47:55 +0700 Subject: [PATCH 1/4] feat: add resource configuration for job --- odpf/optimus/runtime_service.proto | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/odpf/optimus/runtime_service.proto b/odpf/optimus/runtime_service.proto index edeb6065..7e61db02 100644 --- a/odpf/optimus/runtime_service.proto +++ b/odpf/optimus/runtime_service.proto @@ -255,6 +255,16 @@ message JobSpecHook { repeated JobConfigItem config = 2; } +message JobResource { + JobResourceConfig request = 1; + JobResourceConfig limit = 2; +} + +message JobResourceConfig { + string cpu = 1; + string memory = 2; +} + message JobSpecification { int32 version = 1; string name = 2; @@ -301,6 +311,8 @@ message JobSpecification { repeated Notifiers notify = 2; } Behavior behavior = 19; + + JobResource resource = 20; } message JobConfigItem { From bc561b1f895900895c3fbbc26e3d3eb194210a7e Mon Sep 17 00:00:00 2001 From: Anwar Hidayat Date: Fri, 3 Dec 2021 10:23:50 +0700 Subject: [PATCH 2/4] refactor: rename jobresource to jobspecresource for more consistency --- odpf/optimus/runtime_service.proto | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/odpf/optimus/runtime_service.proto b/odpf/optimus/runtime_service.proto index 7e61db02..22dd3744 100644 --- a/odpf/optimus/runtime_service.proto +++ b/odpf/optimus/runtime_service.proto @@ -255,12 +255,12 @@ message JobSpecHook { repeated JobConfigItem config = 2; } -message JobResource { - JobResourceConfig request = 1; - JobResourceConfig limit = 2; +message JobSpecResource { + JobSpecResourceConfig request = 1; + JobSpecResourceConfig limit = 2; } -message JobResourceConfig { +message JobSpecResourceConfig { string cpu = 1; string memory = 2; } @@ -312,7 +312,7 @@ message JobSpecification { } Behavior behavior = 19; - JobResource resource = 20; + JobSpecResource resource = 20; } message JobConfigItem { From 6e548616a7800cf915154501a7d56babdf391bbf Mon Sep 17 00:00:00 2001 From: Anwar Hidayat Date: Wed, 8 Dec 2021 15:25:39 +0700 Subject: [PATCH 3/4] refactorjob resource to be put inside job metadata --- odpf/optimus/runtime_service.proto | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/odpf/optimus/runtime_service.proto b/odpf/optimus/runtime_service.proto index 22dd3744..ddc9579a 100644 --- a/odpf/optimus/runtime_service.proto +++ b/odpf/optimus/runtime_service.proto @@ -255,14 +255,18 @@ message JobSpecHook { repeated JobConfigItem config = 2; } +message JobSpecResourceConfig { + string cpu = 1; + string memory = 2; +} + message JobSpecResource { JobSpecResourceConfig request = 1; JobSpecResourceConfig limit = 2; } -message JobSpecResourceConfig { - string cpu = 1; - string memory = 2; +message JobMetadata { + JobSpecResource resource = 1; } message JobSpecification { @@ -312,7 +316,7 @@ message JobSpecification { } Behavior behavior = 19; - JobSpecResource resource = 20; + JobMetadata metadata = 20; } message JobConfigItem { From eeaef11e70384e27b19195e04051954ad88c2e6c Mon Sep 17 00:00:00 2001 From: Anwar Hidayat Date: Fri, 17 Dec 2021 10:23:20 +0700 Subject: [PATCH 4/4] refactor: rename resource configuration for better clarity --- odpf/optimus/runtime_service.proto | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/odpf/optimus/runtime_service.proto b/odpf/optimus/runtime_service.proto index a97b9536..80512441 100644 --- a/odpf/optimus/runtime_service.proto +++ b/odpf/optimus/runtime_service.proto @@ -255,18 +255,18 @@ message JobSpecHook { repeated JobConfigItem config = 2; } -message JobSpecResourceConfig { +message JobSpecMetadataResourceConfig { string cpu = 1; string memory = 2; } -message JobSpecResource { - JobSpecResourceConfig request = 1; - JobSpecResourceConfig limit = 2; +message JobSpecMetadataResource { + JobSpecMetadataResourceConfig request = 1; + JobSpecMetadataResourceConfig limit = 2; } message JobMetadata { - JobSpecResource resource = 1; + JobSpecMetadataResource resource = 1; } message JobSpecification {