Skip to content

Commit 45ad13e

Browse files
authored
[GOBBLIN-2136] Byebye dag manager (apache#4031)
* removed DagManager * revert back some config name changes * address review comments
1 parent f40bb44 commit 45ad13e

File tree

92 files changed

+1187
-5474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1187
-5474
lines changed

gobblin-api/src/main/java/org/apache/gobblin/configuration/ConfigurationKeys.java

+12-7
Original file line numberDiff line numberDiff line change
@@ -1071,13 +1071,18 @@ public class ConfigurationKeys {
10711071
* Configuration properties related to Flows
10721072
*/
10731073
public static final String FLOW_RUN_IMMEDIATELY = "flow.runImmediately";
1074-
public static final String GOBBLIN_FLOW_SLA_TIME = "gobblin.flow.sla.time";
1075-
public static final String GOBBLIN_FLOW_SLA_TIME_UNIT = "gobblin.flow.sla.timeunit";
1076-
public static final String DEFAULT_GOBBLIN_FLOW_SLA_TIME_UNIT = TimeUnit.MINUTES.name();
1077-
public static final String GOBBLIN_JOB_START_SLA_TIME = "gobblin.job.start.sla.time";
1078-
public static final String GOBBLIN_JOB_START_SLA_TIME_UNIT = "gobblin.job.start.sla.timeunit";
1079-
public static final long FALLBACK_GOBBLIN_JOB_START_SLA_TIME = 10L;
1080-
public static final String FALLBACK_GOBBLIN_JOB_START_SLA_TIME_UNIT = TimeUnit.MINUTES.name();
1074+
/*
1075+
TODO -
1076+
The following config names are different from variable name to maintain backward compatibility.
1077+
We want to change "sla" to "deadline".
1078+
*/
1079+
public static final String GOBBLIN_FLOW_FINISH_DEADLINE_TIME = "gobblin.flow.sla.time";
1080+
public static final String GOBBLIN_FLOW_FINISH_DEADLINE_TIME_UNIT = "gobblin.flow.sla.timeunit";
1081+
public static final String DEFAULT_GOBBLIN_FLOW_FINISH_DEADLINE_TIME_UNIT = TimeUnit.MINUTES.name();
1082+
public static final String GOBBLIN_JOB_START_DEADLINE_TIME = "gobblin.job.start.sla.time";
1083+
public static final String GOBBLIN_JOB_START_DEADLINE_TIME_UNIT = "gobblin.job.start.sla.timeunit";
1084+
public static final long FALLBACK_GOBBLIN_JOB_START_DEADLINE_TIME = 10L;
1085+
public static final String FALLBACK_GOBBLIN_JOB_START_DEADLINE_TIME_UNIT = TimeUnit.MINUTES.name();
10811086
public static final String DATASET_SUBPATHS_KEY = "gobblin.flow.dataset.subPaths";
10821087
public static final String DATASET_BASE_INPUT_PATH_KEY = "gobblin.flow.dataset.baseInputPath";
10831088
public static final String DATASET_BASE_OUTPUT_PATH_KEY = "gobblin.flow.dataset.baseOutputPath";

gobblin-api/src/main/java/org/apache/gobblin/service/ServiceConfigKeys.java

+3-32
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@
1818
package org.apache.gobblin.service;
1919

2020
import java.time.Duration;
21+
import java.util.concurrent.TimeUnit;
2122

22-
import org.apache.gobblin.annotation.Alpha;
23-
24-
@Alpha
2523
public class ServiceConfigKeys {
2624

2725
public static final String GOBBLIN_SERVICE_PREFIX = "gobblin.service.";
28-
public static final String GOBBLIN_SERVICE_JOB_SCHEDULER_LISTENER_CLASS = "org.apache.gobblin.service.modules.scheduler.GobblinServiceJobScheduler";
2926
public static final String GOBBLIN_ORCHESTRATOR_LISTENER_CLASS = "org.apache.gobblin.service.modules.orchestration.Orchestrator";
3027

3128
// Gobblin Service Manager Keys
@@ -37,8 +34,6 @@ public class ServiceConfigKeys {
3734
public static final String GOBBLIN_SERVICE_TOPOLOGY_SPEC_FACTORY_ENABLED_KEY = GOBBLIN_SERVICE_PREFIX + "topologySpecFactory.enabled";
3835
public static final String GOBBLIN_SERVICE_GIT_CONFIG_MONITOR_ENABLED_KEY = GOBBLIN_SERVICE_PREFIX + "gitConfigMonitor.enabled";
3936
public static final String GOBBLIN_SERVICE_JOB_STATUS_MONITOR_ENABLED_KEY = GOBBLIN_SERVICE_PREFIX + "jobStatusMonitor.enabled";
40-
public static final String GOBBLIN_SERVICE_WARM_STANDBY_ENABLED_KEY = GOBBLIN_SERVICE_PREFIX + "warmStandby.enabled";
41-
public static final String GOBBLIN_SERVICE_MULTI_ACTIVE_SCHEDULER_ENABLED_KEY = GOBBLIN_SERVICE_PREFIX + "multiActiveScheduler.enabled";
4237
// If true, will mark up/down d2 servers on leadership so that all requests will be routed to the leader node
4338
public static final String GOBBLIN_SERVICE_D2_ONLY_ANNOUNCE_LEADER = GOBBLIN_SERVICE_PREFIX + "d2.onlyAnnounceLeader";
4439

@@ -68,7 +63,6 @@ public class ServiceConfigKeys {
6863
// Job Level Keys
6964
public static final String WORK_UNIT_SIZE = GOBBLIN_SERVICE_PREFIX + "work.unit.size";
7065
public static final String TOTAL_WORK_UNIT_SIZE = GOBBLIN_SERVICE_PREFIX + "total.work.unit.size";
71-
public static final String TOTAL_WORK_UNIT_COUNT = GOBBLIN_SERVICE_PREFIX + "total.work.unit.count";
7266
/**
7367
* Directly use canonical class name here to avoid introducing additional dependency here.
7468
*/
@@ -94,40 +88,20 @@ public class ServiceConfigKeys {
9488
public static final String DEFAULT_SPEC_EXECUTOR =
9589
"org.apache.gobblin.runtime.spec_executorInstance.InMemorySpecExecutor";
9690
public static final String SPEC_EXECUTOR_KEY = "specExecutorInstance.class";
97-
public static final String EDGE_SECURITY_KEY = "edge.secured";
9891

9992
public static final String DATA_MOVEMENT_AUTHORIZER_CLASS = "dataMovementAuthorizer.class";
10093

10194
// Template Catalog Keys
10295
public static final String TEMPLATE_CATALOGS_FULLY_QUALIFIED_PATH_KEY = GOBBLIN_SERVICE_PREFIX + "templateCatalogs.fullyQualifiedPath";
10396
public static final String TEMPLATE_CATALOGS_CLASS_KEY = GOBBLIN_SERVICE_PREFIX + "templateCatalogs.class";
10497

105-
// Keys related to user-specified policy on route selection.
106-
// Undesired connection to form an executable JobSpec.
107-
// Formatted as a String list, each entry contains a string in the format of "Source1:Sink1:URI",
108-
// which indicates that data movement from source1 to sink1 with specific URI of specExecutor should be avoided.
109-
public static final String POLICY_BASED_BLOCKED_CONNECTION = GOBBLIN_SERVICE_PREFIX + "blockedConnections";
110-
111-
// Comma separated list of nodes that is blacklisted. Names put here will become the nodeName which is the ID of a serviceNode.
112-
public static final String POLICY_BASED_BLOCKED_NODES = GOBBLIN_SERVICE_PREFIX + "blockedNodes";
113-
// Complete path of how the data movement is executed from source to sink.
114-
// Formatted as a String, each hop separated by comma, from source to sink in order.
115-
public static final String POLICY_BASED_DATA_MOVEMENT_PATH = GOBBLIN_SERVICE_PREFIX + "fullDataPath";
116-
11798
public static final String ATTRS_PATH_IN_CONFIG = "executorAttrs";
11899

119100
// Gobblin Service Graph Representation Topology related Keys
120101
public static final String NODE_SECURITY_KEY = "node.secured";
121102
// True means node is by default secure.
122103
public static final String DEFAULT_NODE_SECURITY = "true";
123104

124-
125-
// Policy related configuration Keys
126-
public static final String DEFAULT_SERVICE_POLICY = "static";
127-
public static final String SERVICE_POLICY_NAME = GOBBLIN_SERVICE_PREFIX + "servicePolicy";
128-
// Logging
129-
public static final String GOBBLIN_SERVICE_LOG4J_CONFIGURATION_FILE = "log4j-service.properties";
130-
// GAAS Listerning Port
131105
public static final String SERVICE_PORT = GOBBLIN_SERVICE_PREFIX + "port";
132106
public static final String SERVICE_NAME = GOBBLIN_SERVICE_PREFIX + "serviceName";
133107
public static final String SERVICE_URL_PREFIX = GOBBLIN_SERVICE_PREFIX + "serviceUrlPrefix";
@@ -171,9 +145,7 @@ public class ServiceConfigKeys {
171145
public static final String STATE_STORE_KEY_SEPARATION_CHARACTER = ".";
172146
public static final String DAG_STORE_KEY_SEPARATION_CHARACTER = "_";
173147

174-
175148
// Service database connection
176-
177149
public static final String SERVICE_DB_URL_KEY = GOBBLIN_SERVICE_PREFIX + "db.url";
178150
public static final String SERVICE_DB_USERNAME = GOBBLIN_SERVICE_PREFIX + "db.username";
179151
public static final String SERVICE_DB_PASSWORD = GOBBLIN_SERVICE_PREFIX + "db.password";
@@ -203,12 +175,11 @@ public class ServiceConfigKeys {
203175
public static final int DEFAULT_MEMORY_ISSUE_REPO_MAX_ISSUE_PER_CONTEXT= 20;
204176

205177
public static final String ISSUE_REPO_CLASS = GOBBLIN_SERVICE_PREFIX + "issueRepo.class";
178+
public static final String QUOTA_MANAGER_PREFIX = "UserQuotaManagerPrefix.";
206179

207180
public static final String GOBBLIN_SERVICE_DAG_PROCESSING_ENGINE_PREFIX = ServiceConfigKeys.GOBBLIN_SERVICE_PREFIX + "dagProcessingEngine.";
208-
public static final String DAG_PROCESSING_ENGINE_ENABLED = GOBBLIN_SERVICE_DAG_PROCESSING_ENGINE_PREFIX + "enabled";
209181
public static final String NUM_DAG_PROC_THREADS_KEY = GOBBLIN_SERVICE_DAG_PROCESSING_ENGINE_PREFIX + "numThreads";
210182
public static final String DAG_PROC_ENGINE_NON_RETRYABLE_EXCEPTIONS_KEY = GOBBLIN_SERVICE_DAG_PROCESSING_ENGINE_PREFIX + "nonRetryableExceptions";
211-
212183
public static final Integer DEFAULT_NUM_DAG_PROC_THREADS = 3;
213-
public static final String GOBBLIN_SERVICE_MULTI_ACTIVE_EXECUTION_ENABLED = GOBBLIN_SERVICE_PREFIX + "multiActiveExecutionEnabled";
184+
public static final long DEFAULT_FLOW_FINISH_DEADLINE_MILLIS = TimeUnit.HOURS.toMillis(24);
214185
}

gobblin-metrics-libs/gobblin-metrics/src/main/java/org/apache/gobblin/metrics/ServiceMetricNames.java

-12
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ public class ServiceMetricNames {
4848
public static final String FLOW_TRIGGER_HANDLER_FAILED_TO_RECORD_LEASE_SUCCESS_COUNT = FLOW_TRIGGER_HANDLER_PREFIX + "failedToRecordLeaseSuccessCount";
4949
public static final String FLOW_TRIGGER_HANDLER_RECORDED_LEASE_SUCCESS_COUNT = FLOW_TRIGGER_HANDLER_PREFIX + "recordedLeaseSuccessCount";
5050

51-
// DagManager Related Metrics
52-
public static final String DAG_MANAGER_PREFIX = GOBBLIN_SERVICE_PREFIX_WITH_DELIMITER + "dagManager";
53-
public static final String FLOW_FAILED_FORWARD_TO_DAG_MANAGER_COUNT = DAG_MANAGER_PREFIX + ".flowFailedForwardToDagManagerCount";
54-
55-
//Job status poll timer
56-
public static final String JOB_STATUS_POLLED_TIMER = GOBBLIN_SERVICE_PREFIX_WITH_DELIMITER + "jobStatusPoll.time";
57-
5851
public static final String CREATE_FLOW_METER = "CreateFlow";
5952
public static final String DELETE_FLOW_METER = "DeleteFlow";
6053
public static final String RUN_IMMEDIATELY_FLOW_METER = "RunImmediatelyFlow";
@@ -71,14 +64,9 @@ public class ServiceMetricNames {
7164
public static final String RUNNING_STATUS = "RunningStatus";
7265
public static final String JOBS_SENT_TO_SPEC_EXECUTOR = "JobsSentToSpecExecutor";
7366

74-
public static final String HELIX_LEADER_STATE = "HelixLeaderState";
75-
7667
public static final String FLOWGRAPH_UPDATE_FAILED_METER = GOBBLIN_SERVICE_PREFIX_WITH_DELIMITER + "FlowgraphUpdateFailed";
77-
7868
public static final String DAG_COUNT_MYSQL_DAG_STATE_COUNT = GOBBLIN_SERVICE_PREFIX_WITH_DELIMITER + "MysqlDagStateStore" + ".totalDagCount";
79-
8069
public static final String DAG_COUNT_FS_DAG_STATE_COUNT = GOBBLIN_SERVICE_PREFIX_WITH_DELIMITER + "FsDagStateStore" + ".totalDagCount";
81-
8270
public static final String DAG_PROCESSING_EXCEPTION_METER = "DagProcessingException";
8371
public static final String DAG_ACTIONS_CREATE_EXCEPTIONS_IN_JOB_STATUS_MONITOR = "DagActionsCreateExceptionsInJobStatusMonitor";
8472

0 commit comments

Comments
 (0)