Skip to content

KAFKA-20297: move Scheduler from client common to trogdor #21753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chia7712 merged 4 commits into from
Mar 18, 2026
Merged

KAFKA-20297: move Scheduler from client common to trogdor #21753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf6b0f9
refactor: move Scheduler from client common to trogdor, implement a l…
cychiu8 Mar 13, 2026
f2be142
refactor: spotlessCheck update
cychiu8 Mar 14, 2026
b17f21a
refactor: simply time MockScheduler implementation in ExpiringCredent…
cychiu8 Mar 17, 2026
4391eac
refactor: simplify implementation and remove unused constants in Plat…
cychiu8 Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions clients/src/main/java/org/apache/kafka/common/utils/SystemScheduler.java
View file
Open in desktop

This file was deleted.

36 changes: 35 additions & 1 deletion ...common/security/oauthbearer/internals/expiring/ExpiringCredentialRefreshingLoginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.apache.kafka.common.config.SaslConfigs;
import org.apache.kafka.common.internals.KafkaFutureImpl;
import org.apache.kafka.common.security.oauthbearer.internals.expiring.ExpiringCredentialRefreshingLogin.LoginContextFactory;
import org.apache.kafka.common.utils.MockScheduler;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;

Expand All @@ -35,6 +34,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.TreeMap;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;

Expand Down Expand Up @@ -284,6 +284,40 @@ public Future<?> refresherThreadDoneFuture() {
}
}

/*
Copy link
Member

@chia7712 chia7712 Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you remove unused comment?

* */
private static class MockScheduler implements MockTime.Listener {

private final MockTime time;
private final Map<Long, List<KafkaFutureImpl<Long>>> waiters = new TreeMap<>();

public MockScheduler(MockTime time) {
this.time = time;
time.addListener(this);
}

@Override
public synchronized void onTimeUpdated() {
Copy link
Member

@chia7712 chia7712 Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

        @Override
        public synchronized void onTimeUpdated() {
            long timeMs = time.milliseconds();
            var iterator = waiters.entrySet().iterator();
            while (iterator.hasNext()) {
                var entry = iterator.next();
                if (entry.getKey() > timeMs) break;
                entry.getValue().forEach(future -> future.complete(timeMs));
                iterator.remove();
            }
        }

long timeMs = time.milliseconds();
var iterator = waiters.entrySet().iterator();
while (iterator.hasNext()) {
var entry = iterator.next();
if (entry.getKey() > timeMs) break;
entry.getValue().forEach(future -> future.complete(timeMs));
iterator.remove();
}
}

public synchronized void addWaiter(long delayMs, KafkaFutureImpl<Long> waiter) {
long timeMs = time.milliseconds();
if (delayMs <= 0) {
waiter.complete(timeMs);
} else {
waiters.computeIfAbsent(timeMs + delayMs, k -> new ArrayList<>()).add(waiter);
}
}
}

@Test
public void testRefresh() throws Exception {
for (int numExpectedRefreshes : new int[] {0, 1, 2}) {
Expand Down
2 changes: 1 addition & 1 deletion trogdor/src/main/java/org/apache/kafka/trogdor/agent/Agent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

import org.apache.kafka.common.KafkaFuture;
import org.apache.kafka.common.utils.Exit;
import org.apache.kafka.common.utils.Scheduler;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Node;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.Scheduler;
import org.apache.kafka.trogdor.rest.AgentStatusResponse;
import org.apache.kafka.trogdor.rest.CreateWorkerRequest;
import org.apache.kafka.trogdor.rest.DestroyWorkerRequest;
Expand Down
2 changes: 1 addition & 1 deletion trogdor/src/main/java/org/apache/kafka/trogdor/agent/WorkerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.KafkaFuture;
import org.apache.kafka.common.internals.KafkaFutureImpl;
import org.apache.kafka.common.utils.Scheduler;
import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.Scheduler;
import org.apache.kafka.trogdor.rest.RequestConflictException;
import org.apache.kafka.trogdor.rest.WorkerDone;
import org.apache.kafka.trogdor.rest.WorkerRunning;
Expand Down
2 changes: 1 addition & 1 deletion trogdor/src/main/java/org/apache/kafka/trogdor/basic/BasicPlatform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@

package org.apache.kafka.trogdor.basic;

import org.apache.kafka.common.utils.Scheduler;
import org.apache.kafka.common.utils.Shell;
import org.apache.kafka.trogdor.common.Node;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.Scheduler;
import org.apache.kafka.trogdor.common.Topology;

import com.fasterxml.jackson.databind.JsonNode;
Expand Down
6 changes: 0 additions & 6 deletions trogdor/src/main/java/org/apache/kafka/trogdor/common/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.kafka.trogdor.common;

import org.apache.kafka.common.utils.Scheduler;
import org.apache.kafka.common.utils.Utils;

import com.fasterxml.jackson.databind.JsonNode;
Copy link
Member

@chia7712 chia7712 Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TROGDOR_COORDINATOR_HEARTBEAT_MS and TROGDOR_COORDINATOR_HEARTBEAT_MS_DEFAULT are unused. Could you remove them?

Expand All @@ -34,11 +33,6 @@ class Config {

public static final String TROGDOR_COORDINATOR_PORT = "trogdor.coordinator.port";

public static final String TROGDOR_COORDINATOR_HEARTBEAT_MS =
"trogdor.coordinator.heartbeat.ms";

public static final int TROGDOR_COORDINATOR_HEARTBEAT_MS_DEFAULT = 60000;

public static Platform parse(String curNodeName, String path) throws Exception {
JsonNode root = JsonUtil.JSON_SERDE.readTree(new File(path));
JsonNode platformNode = root.get("platform");
Expand Down
17 changes: 15 additions & 2 deletions .../apache/kafka/common/utils/Scheduler.java → ...pache/kafka/trogdor/common/Scheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.kafka.common.utils;
package org.apache.kafka.trogdor.common;

import org.apache.kafka.common.utils.Time;

import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;

/**
* An interface for scheduling tasks for the future.
*
* Implementations of this class should be thread-safe.
*/
public interface Scheduler {
Scheduler SYSTEM = new SystemScheduler();
Scheduler SYSTEM = new Scheduler() {
@Override
public Time time() {
return Time.SYSTEM;
}

@Override
public <T> Future<T> schedule(ScheduledExecutorService executor, Callable<T> callable, long delayMs) {
return executor.schedule(callable, delayMs, TimeUnit.MILLISECONDS);
}
};

/**
* Get the timekeeper associated with this scheduler.
Expand Down
2 changes: 1 addition & 1 deletion trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/Coordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
package org.apache.kafka.trogdor.coordinator;

import org.apache.kafka.common.utils.Exit;
import org.apache.kafka.common.utils.Scheduler;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.trogdor.common.Node;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.Scheduler;
import org.apache.kafka.trogdor.rest.CoordinatorStatusResponse;
import org.apache.kafka.trogdor.rest.CreateTaskRequest;
import org.apache.kafka.trogdor.rest.DestroyTaskRequest;
Expand Down
2 changes: 1 addition & 1 deletion trogdor/src/main/java/org/apache/kafka/trogdor/coordinator/TaskManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@

import org.apache.kafka.common.KafkaException;
import org.apache.kafka.common.errors.InvalidRequestException;
import org.apache.kafka.common.utils.Scheduler;
import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.Node;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.Scheduler;
import org.apache.kafka.trogdor.rest.RequestConflictException;
import org.apache.kafka.trogdor.rest.TaskDone;
import org.apache.kafka.trogdor.rest.TaskPending;
Expand Down
4 changes: 2 additions & 2 deletions trogdor/src/test/java/org/apache/kafka/trogdor/agent/AgentTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@

package org.apache.kafka.trogdor.agent;

import org.apache.kafka.common.utils.MockScheduler;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Scheduler;
import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.test.TestUtils;
import org.apache.kafka.trogdor.basic.BasicNode;
Expand All @@ -28,8 +26,10 @@
import org.apache.kafka.trogdor.common.ExpectedTasks;
import org.apache.kafka.trogdor.common.ExpectedTasks.ExpectedTaskBuilder;
import org.apache.kafka.trogdor.common.JsonUtil;
import org.apache.kafka.trogdor.common.MockScheduler;
import org.apache.kafka.trogdor.common.Node;
import org.apache.kafka.trogdor.common.Platform;
import org.apache.kafka.trogdor.common.Scheduler;
import org.apache.kafka.trogdor.fault.FilesUnreadableFaultSpec;
import org.apache.kafka.trogdor.fault.Kibosh;
import org.apache.kafka.trogdor.fault.Kibosh.KiboshControlFile;
Expand Down
1 change: 0 additions & 1 deletion trogdor/src/test/java/org/apache/kafka/trogdor/common/MiniTrogdorCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.kafka.trogdor.common;

import org.apache.kafka.common.utils.Scheduler;
import org.apache.kafka.common.utils.ThreadUtils;
import org.apache.kafka.trogdor.agent.Agent;
import org.apache.kafka.trogdor.agent.AgentClient;
Expand Down
4 changes: 3 additions & 1 deletion ...che/kafka/common/utils/MockScheduler.java → ...e/kafka/trogdor/common/MockScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.kafka.common.utils;
package org.apache.kafka.trogdor.common;

import org.apache.kafka.common.internals.KafkaFutureImpl;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
4 changes: 2 additions & 2 deletions trogdor/src/test/java/org/apache/kafka/trogdor/coordinator/CoordinatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@

package org.apache.kafka.trogdor.coordinator;

import org.apache.kafka.common.utils.MockScheduler;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Scheduler;
import org.apache.kafka.test.TestUtils;
import org.apache.kafka.trogdor.agent.AgentClient;
import org.apache.kafka.trogdor.common.CapturingCommandRunner;
import org.apache.kafka.trogdor.common.ExpectedTasks;
import org.apache.kafka.trogdor.common.ExpectedTasks.ExpectedTaskBuilder;
import org.apache.kafka.trogdor.common.MiniTrogdorCluster;
import org.apache.kafka.trogdor.common.MockScheduler;
import org.apache.kafka.trogdor.common.Scheduler;
import org.apache.kafka.trogdor.fault.NetworkPartitionFaultSpec;
import org.apache.kafka.trogdor.rest.CoordinatorStatusResponse;
import org.apache.kafka.trogdor.rest.CreateTaskRequest;
Expand Down
Loading