Skip to content

Commit aa697b1

Browse files
authored
Merge branch 'master' into rbac
2 parents 6602845 + 55fb785 commit aa697b1

40 files changed

+1177
-397
lines changed

amoro-ams/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,14 +450,12 @@
450450
<dependency>
451451
<groupId>org.testcontainers</groupId>
452452
<artifactId>testcontainers</artifactId>
453-
<version>1.20.1</version>
454453
<scope>test</scope>
455454
</dependency>
456455

457456
<dependency>
458457
<groupId>org.testcontainers</groupId>
459458
<artifactId>junit-jupiter</artifactId>
460-
<version>1.20.1</version>
461459
<scope>test</scope>
462460
</dependency>
463461

@@ -471,14 +469,12 @@
471469
<dependency>
472470
<groupId>org.testcontainers</groupId>
473471
<artifactId>k3s</artifactId>
474-
<version>1.20.1</version>
475472
<scope>test</scope>
476473
</dependency>
477474

478475
<dependency>
479476
<groupId>org.testcontainers</groupId>
480477
<artifactId>mysql</artifactId>
481-
<version>1.20.1</version>
482478
<scope>test</scope>
483479
</dependency>
484480

amoro-ams/src/main/java/org/apache/amoro/server/AmoroManagementConf.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,23 @@ public class AmoroManagementConf {
581581
.defaultValue(Duration.ofSeconds(3))
582582
.withDescription("Optimizer polling task timeout.");
583583

584+
public static final ConfigOption<Duration> OPTIMIZER_GROUP_MIN_PARALLELISM_CHECK_INTERVAL =
585+
ConfigOptions.key("optimizer-group.min-parallelism-check-interval")
586+
.durationType()
587+
.defaultValue(Duration.ofMinutes(5))
588+
.withDescription(
589+
"The interval for checking and ensuring the optimizer group meets its minimum parallelism requirement. "
590+
+ "When the current parallelism falls below the configured min-parallelism, "
591+
+ "the system will attempt to scale out optimizers at this interval. "
592+
+ "The actual scale-out timing is calculated as: consecutive keeping attempts * this interval.");
593+
594+
public static final ConfigOption<Integer> OPTIMIZER_GROUP_MAX_KEEPING_ATTEMPTS =
595+
ConfigOptions.key("optimizer-group.max-keeping-attempts")
596+
.intType()
597+
.defaultValue(3)
598+
.withDescription(
599+
"The maximum number of consecutive attempts to keep the optimizer group at its current parallelism.");
600+
584601
public static final ConfigOption<Duration> OPTIMIZING_REFRESH_GROUP_INTERVAL =
585602
ConfigOptions.key("self-optimizing.refresh-group-interval")
586603
.durationType()

amoro-ams/src/main/java/org/apache/amoro/server/AmoroServiceContainer.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ public void transitionToFollower() {
236236
}
237237

238238
public void startOptimizingService() throws Exception {
239+
239240
// Load process factories and build action coordinators from default table runtime factory.
240241
TableProcessFactoryManager tableProcessFactoryManager = new TableProcessFactoryManager();
241242
tableProcessFactoryManager.initialize();
@@ -246,6 +247,8 @@ public void startOptimizingService() throws Exception {
246247

247248
List<ActionCoordinator> actionCoordinators = defaultRuntimeFactory.supportedCoordinators();
248249
ExecuteEngineManager executeEngineManager = new ExecuteEngineManager();
250+
processFactories.forEach(
251+
c -> c.availableExecuteEngines(executeEngineManager.installedPlugins()));
249252

250253
tableService = new DefaultTableService(serviceConfig, catalogManager, defaultRuntimeFactory);
251254
processService = new ProcessService(tableService, actionCoordinators, executeEngineManager);

0 commit comments

Comments
 (0)