Rip out multi-leader paxos and timestamp paxos batching

palantir · Nov 8, 2024 · 5e7d210 · 5e7d210
1 parent 3cb5a8a
commit 5e7d210
Show file tree

Hide file tree

Showing 100 changed files with 169 additions and 6,965 deletions.
diff --git a/atlasdb-commons/src/main/java/com/palantir/common/proxy/PredicateSwitchedProxy.java b/atlasdb-commons/src/main/java/com/palantir/common/proxy/PredicateSwitchedProxy.java
diff --git a/atlasdb-commons/src/test/java/com/palantir/common/proxy/PredicateSwitchedProxyTest.java b/atlasdb-commons/src/test/java/com/palantir/common/proxy/PredicateSwitchedProxyTest.java
diff --git a/...s-shared/src/main/java/com/palantir/timelock/paxos/AbstractInMemoryTimelockExtension.java b/...s-shared/src/main/java/com/palantir/timelock/paxos/AbstractInMemoryTimelockExtension.java
@@ -59,7 +59,6 @@
 import com.palantir.timelock.config.ImmutableSqlitePaxosPersistenceConfiguration;
 import com.palantir.timelock.config.ImmutableTimeLockRuntimeConfiguration;
 import com.palantir.timelock.config.PaxosInstallConfiguration;
-import com.palantir.timelock.config.PaxosInstallConfiguration.PaxosLeaderMode;
 import com.palantir.timelock.config.TimeLockInstallConfiguration;
 import com.palantir.timelock.config.TimeLockRuntimeConfiguration;
 import com.palantir.timestamp.ManagedTimestampService;
@@ -106,7 +105,6 @@ void setClient(String client) {
     public void setup() {
         PaxosInstallConfiguration paxos = PaxosInstallConfiguration.builder()
                 .dataDirectory(tryCreateSubFolder())
-                .leaderMode(PaxosLeaderMode.SINGLE_LEADER)
                 .sqlitePersistence(ImmutableSqlitePaxosPersistenceConfiguration.builder()
                         .dataDirectory(tryCreateSubFolder())
                         .build())

diff --git a/...ent/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingNetworkClientFactories.java b/...ent/src/main/java/com/palantir/atlasdb/timelock/paxos/BatchingNetworkClientFactories.java
diff --git a/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/Factories.java b/timelock-agent/src/main/java/com/palantir/atlasdb/timelock/paxos/Factories.java
@@ -16,7 +16,6 @@
 
 package com.palantir.atlasdb.timelock.paxos;
 
-import com.google.common.collect.ImmutableList;
 import com.palantir.paxos.LeaderPinger;
 import com.palantir.paxos.PaxosAcceptorNetworkClient;
 import com.palantir.paxos.PaxosConstants;
@@ -49,39 +48,13 @@ interface PaxosLatestRoundVerifierFactory {
         PaxosLatestRoundVerifier create(PaxosAcceptorNetworkClient acceptorNetworkClient);
     }
 
-    @Value.Immutable
-    abstract class BatchingLeaderPingerFactory implements LeaderPingerFactoryContainer, Dependencies.LeaderPinger {
-
-        @Value.Derived
-        AutobatchingPingableLeaderFactory pingableLeaderFactory() {
-            return AutobatchingPingableLeaderFactory.create(
-                    WithDedicatedExecutor.convert(remoteClients().batchPingableLeadersWithContext()),
-                    leaderPingRate(),
-                    leaderPingResponseWait(),
-                    leaderUuid());
-        }
-
-        @Override
-        public NetworkClientFactories.Factory<LeaderPinger> get() {
-            return pingableLeaderFactory()::leaderPingerFor;
-        }
-
-        @Override
-        @Value.Derived
-        public List<Closeable> closeables() {
-            return ImmutableList.of(pingableLeaderFactory());
-        }
-
-        public abstract static class Builder implements LeaderPingerFactoryContainer.Builder {}
-    }
-
     @Value.Immutable
     abstract class SingleLeaderPingerFactory implements LeaderPingerFactoryContainer, Dependencies.LeaderPinger {
 
         @Value.Derived
         SingleLeaderPinger pinger() {
             return SingleLeaderPinger.create(
-                    WithDedicatedExecutor.convert(remoteClients().nonBatchPingableLeadersWithContext()),
+                    WithDedicatedExecutor.convert(remoteClients().pingableLeadersWithContext()),
                     dataSource(),
                     leaderPingResponseWait(),
                     greenNodeLeadershipBackoff(),

diff --git a/...agent/src/main/java/com/palantir/atlasdb/timelock/paxos/MultiLeaderHealthCheckPinger.java b/...agent/src/main/java/com/palantir/atlasdb/timelock/paxos/MultiLeaderHealthCheckPinger.java