CipherLabs
/
besu
mirror of https://github.com/hyperledger/besu
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove --fast-sync-wait-time option (#1297)

Browse Source 
Signed-off-by: Adrian Sutton <adrian.sutton@consensys.net>
pull/2/head
Adrian Sutton 6 years ago committed by GitHub
parent e187429fed
commit 7cf8f0871e
9 changed files with 8 additions and 122 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SynchronizerConfiguration.java
  2. 39
      ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActions.java
  3. 21
      ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActionsTest.java
  4. 18
      pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
  5. 2
      pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java
  6. 3
      pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandTestAbstract.java
  7. 29
      pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java
  8. 1
      pantheon/src/test/resources/complete_config.toml
  9. 1
      pantheon/src/test/resources/everything_config.toml

16
ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/SynchronizerConfiguration.java
Unescape View File

@ -16,7 +16,6 @@ import static com.google.common.base.Preconditions.checkArgument;
import tech.pegasys.pantheon.util.uint.UInt256;
import java.time.Duration;
import java.util.Iterator;
import java.util.concurrent.TimeUnit;
@ -30,7 +29,6 @@ public class SynchronizerConfiguration {
private static final int DEFAULT_PIVOT_DISTANCE_FROM_HEAD = 50;
private static final float DEFAULT_FULL_VALIDATION_RATE = .1f;
private static final int DEFAULT_FAST_SYNC_MINIMUM_PEERS = 5;
private static final Duration DEFAULT_FAST_SYNC_MAXIMUM_PEER_WAIT_TIME = Duration.ofSeconds(0);
private static final int DEFAULT_WORLD_STATE_HASH_COUNT_PER_REQUEST = 384;
private static final int DEFAULT_WORLD_STATE_REQUEST_PARALLELISM = 10;
private static final int DEFAULT_WORLD_STATE_MAX_REQUESTS_WITHOUT_PROGRESS = 1000;
@ -41,7 +39,6 @@ public class SynchronizerConfiguration {
private final int fastSyncPivotDistance;
private final float fastSyncFullValidationRate;
private final int fastSyncMinimumPeerCount;
private final Duration fastSyncMaximumPeerWaitTime;
private final int worldStateHashCountPerRequest;
private final int worldStateRequestParallelism;
private final int worldStateMaxRequestsWithoutProgress;
@ -69,7 +66,6 @@ public class SynchronizerConfiguration {
final int fastSyncPivotDistance,
final float fastSyncFullValidationRate,
final int fastSyncMinimumPeerCount,
final Duration fastSyncMaximumPeerWaitTime,
final int worldStateHashCountPerRequest,
final int worldStateRequestParallelism,
final int worldStateMaxRequestsWithoutProgress,
@ -89,7 +85,6 @@ public class SynchronizerConfiguration {
this.fastSyncPivotDistance = fastSyncPivotDistance;
this.fastSyncFullValidationRate = fastSyncFullValidationRate;
this.fastSyncMinimumPeerCount = fastSyncMinimumPeerCount;
this.fastSyncMaximumPeerWaitTime = fastSyncMaximumPeerWaitTime;
this.worldStateHashCountPerRequest = worldStateHashCountPerRequest;
this.worldStateRequestParallelism = worldStateRequestParallelism;
this.worldStateMaxRequestsWithoutProgress = worldStateMaxRequestsWithoutProgress;
@ -192,10 +187,6 @@ public class SynchronizerConfiguration {
return fastSyncMinimumPeerCount;
}
public Duration getFastSyncMaximumPeerWaitTime() {
return fastSyncMaximumPeerWaitTime;
}
public int getWorldStateHashCountPerRequest() {
return worldStateHashCountPerRequest;
}
@ -219,7 +210,6 @@ public class SynchronizerConfiguration {
public static class Builder {
private SyncMode syncMode = SyncMode.FULL;
private int fastSyncMinimumPeerCount = DEFAULT_FAST_SYNC_MINIMUM_PEERS;
private Duration fastSyncMaximumPeerWaitTime = DEFAULT_FAST_SYNC_MAXIMUM_PEER_WAIT_TIME;
private int maxTrailingPeers = Integer.MAX_VALUE;
@CommandLine.Option(
@ -465,11 +455,6 @@ public class SynchronizerConfiguration {
return this;
}
public Builder fastSyncMaximumPeerWaitTime(final Duration fastSyncMaximumPeerWaitTime) {
this.fastSyncMaximumPeerWaitTime = fastSyncMaximumPeerWaitTime;
return this;
}
public Builder worldStateMinMillisBeforeStalling(final long worldStateMinMillisBeforeStalling) {
this.worldStateMinMillisBeforeStalling = worldStateMinMillisBeforeStalling;
return this;
@ -485,7 +470,6 @@ public class SynchronizerConfiguration {
fastSyncPivotDistance,
fastSyncFullValidationRate,
fastSyncMinimumPeerCount,
fastSyncMaximumPeerWaitTime,
worldStateHashCountPerRequest,
worldStateRequestParallelism,
worldStateMaxRequestsWithoutProgress,

39
ethereum/eth/src/main/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActions.java
Unescape View File

@ -20,7 +20,6 @@ import static tech.pegasys.pantheon.util.FutureUtils.exceptionallyCompose;
import tech.pegasys.pantheon.ethereum.ProtocolContext;
import tech.pegasys.pantheon.ethereum.core.BlockHeader;
import tech.pegasys.pantheon.ethereum.eth.manager.EthContext;
import tech.pegasys.pantheon.ethereum.eth.manager.EthScheduler;
import tech.pegasys.pantheon.ethereum.eth.manager.task.WaitForPeersTask;
import tech.pegasys.pantheon.ethereum.eth.sync.ChainDownloader;
import tech.pegasys.pantheon.ethereum.eth.sync.SynchronizerConfiguration;
@ -70,40 +69,10 @@ public class FastSyncActions<C> {
WaitForPeersTask.create(
ethContext, syncConfig.getFastSyncMinimumPeerCount(), metricsSystem);
final EthScheduler scheduler = ethContext.getScheduler();
final CompletableFuture<Void> fastSyncTask;
if (!syncConfig.getFastSyncMaximumPeerWaitTime().isZero()) {
LOG.debug(
"Waiting for at least {} peers, maximum wait time set to {}.",
syncConfig.getFastSyncMinimumPeerCount(),
syncConfig.getFastSyncMaximumPeerWaitTime().toString());
fastSyncTask =
scheduler.timeout(waitForPeersTask, syncConfig.getFastSyncMaximumPeerWaitTime());
} else {
LOG.debug(
"Waiting for at least {} peers, no maximum wait time set.",
syncConfig.getFastSyncMinimumPeerCount());
fastSyncTask = scheduler.scheduleServiceTask(waitForPeersTask);
}
return exceptionallyCompose(
fastSyncTask,
error -> {
if (ExceptionUtils.rootCause(error) instanceof TimeoutException) {
if (ethContext.getEthPeers().availablePeerCount() > 0) {
LOG.warn(
"Fast sync timed out before minimum peer count was reached. Continuing with reduced peers.");
return completedFuture(null);
} else {
LOG.warn(
"Maximum wait time for fast sync reached but no peers available. Continuing to wait for any available peer.");
return waitForAnyPeer();
}
} else if (error != null) {
LOG.error("Failed to find peers for fast sync", error);
return completedExceptionally(error);
}
return null;
})
LOG.debug("Waiting for at least {} peers.", syncConfig.getFastSyncMinimumPeerCount());
return ethContext
.getScheduler()
.scheduleServiceTask(waitForPeersTask)
.thenApply(successfulWaitResult -> fastSyncState);
}

21
ethereum/eth/src/test/java/tech/pegasys/pantheon/ethereum/eth/sync/fastsync/FastSyncActionsTest.java
Unescape View File

@ -38,7 +38,6 @@ import tech.pegasys.pantheon.ethereum.mainnet.ProtocolSchedule;
import tech.pegasys.pantheon.metrics.noop.NoOpMetricsSystem;
import tech.pegasys.pantheon.util.uint.UInt256;
import java.time.Duration;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
@ -51,7 +50,6 @@ public class FastSyncActionsTest {
private final SynchronizerConfiguration syncConfig =
new SynchronizerConfiguration.Builder()
.syncMode(SyncMode.FAST)
.fastSyncMaximumPeerWaitTime(Duration.ofMinutes(5))
.fastSyncPivotDistance(1000)
.build();
@ -94,25 +92,6 @@ public class FastSyncActionsTest {
assertThat(result).isCompletedWithValue(EMPTY_SYNC_STATE);
}
@Test
public void waitForPeersShouldReportSuccessWhenTimeLimitReachedAndAPeerIsAvailable() {
EthProtocolManagerTestUtil.createPeer(ethProtocolManager);
timeoutCount.set(Integer.MAX_VALUE);
assertThat(fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE))
.isCompletedWithValue(EMPTY_SYNC_STATE);
}
@Test
public void waitForPeersShouldContinueWaitingUntilAtLeastOnePeerIsAvailable() {
timeoutCount.set(1);
final CompletableFuture<FastSyncState> result =
fastSyncActions.waitForSuitablePeers(EMPTY_SYNC_STATE);
assertThat(result).isNotCompleted();
EthProtocolManagerTestUtil.createPeer(ethProtocolManager);
assertThat(result).isCompletedWithValue(EMPTY_SYNC_STATE);
}
@Test
public void waitForPeersShouldOnlyRequireOnePeerWhenPivotBlockIsAlreadySelected() {
final BlockHeader pivotHeader = new BlockHeaderTestFixture().number(1024).buildHeader();

18
pantheon/src/main/java/tech/pegasys/pantheon/cli/PantheonCommand.java
Unescape View File

@ -15,6 +15,7 @@ package tech.pegasys.pantheon.cli;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static tech.pegasys.pantheon.cli.CommandLineUtils.checkOptionDependencies;
import static tech.pegasys.pantheon.cli.DefaultCommandValues.getDefaultPantheonDataPath;
import static tech.pegasys.pantheon.cli.NetworkName.MAINNET;
@ -79,7 +80,6 @@ import java.net.InetAddress;
import java.net.URI;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@ -219,14 +219,6 @@ public class PantheonCommand implements DefaultCommandValues, Runnable {
"Minimum number of peers required before starting fast sync. (default: ${DEFAULT-VALUE})")
private final Integer fastSyncMinPeerCount = FAST_SYNC_MIN_PEER_COUNT;
@Option(
hidden = true,
names = {"--fast-sync-max-wait-time"},
paramLabel = MANDATORY_INTEGER_FORMAT_HELP,
description =
"Maximum time to wait for the required number of peers before starting fast sync, expressed in seconds, 0 means no timeout (default: ${DEFAULT-VALUE})")
private final Integer fastSyncMaxWaitTime = FAST_SYNC_MAX_WAIT_TIME;
@Option(
names = {"--network"},
paramLabel = MANDATORY_NETWORK_FORMAT_HELP,
@ -626,17 +618,12 @@ public class PantheonCommand implements DefaultCommandValues, Runnable {
!isMiningEnabled,
asList("--miner-coinbase", "--min-gas-price", "--miner-extra-data"));
// Check that fast sync options are able to work or send an error
if (fastSyncMaxWaitTime < 0) {
throw new ParameterException(
commandLine, "--fast-sync-max-wait-time must be greater than or equal to 0");
}
checkOptionDependencies(
logger,
commandLine,
"--sync-mode",
!SyncMode.FAST.equals(syncMode),
asList("--fast-sync-min-peers", "--fast-sync-max-wait-time"));
singletonList("--fast-sync-min-peers"));
//noinspection ConstantConditions
if (isMiningEnabled && coinbase == null) {
@ -940,7 +927,6 @@ public class PantheonCommand implements DefaultCommandValues, Runnable {
return synchronizerConfigurationBuilder
.syncMode(syncMode)
.fastSyncMinimumPeerCount(fastSyncMinPeerCount)
.fastSyncMaximumPeerWaitTime(Duration.ofSeconds(fastSyncMaxWaitTime))
.maxTrailingPeers(TrailingPeerRequirements.calculateMaxTrailingPeers(maxPeers))
.build();
}

2
pantheon/src/test/java/tech/pegasys/pantheon/RunnerTest.java
Unescape View File

@ -53,7 +53,6 @@ import tech.pegasys.pantheon.util.uint.UInt256;
import java.io.IOException;
import java.net.InetAddress;
import java.nio.file.Path;
import java.time.Duration;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
@ -169,7 +168,6 @@ public final class RunnerTest {
.syncMode(mode)
.fastSyncPivotDistance(5)
.fastSyncMinimumPeerCount(1)
.fastSyncMaximumPeerWaitTime(Duration.ofSeconds(1))
.build();
final Path dataDirBehind = temp.newFolder().toPath();
final JsonRpcConfiguration behindJsonRpcConfiguration = jsonRpcConfiguration();

3
pantheon/src/test/java/tech/pegasys/pantheon/cli/CommandTestAbstract.java
Unescape View File

@ -38,7 +38,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.PrintStream;
import java.nio.file.Path;
import java.time.Duration;
import java.util.Collection;
import org.apache.logging.log4j.LogManager;
@ -120,8 +119,6 @@ public abstract class CommandTestAbstract {
when(mockSyncConfBuilder.syncMode(any())).thenReturn(mockSyncConfBuilder);
when(mockSyncConfBuilder.maxTrailingPeers(anyInt())).thenReturn(mockSyncConfBuilder);
when(mockSyncConfBuilder.fastSyncMinimumPeerCount(anyInt())).thenReturn(mockSyncConfBuilder);
when(mockSyncConfBuilder.fastSyncMaximumPeerWaitTime(any(Duration.class)))
.thenReturn(mockSyncConfBuilder);
when(mockSyncConfBuilder.build()).thenReturn(mockSyncConf);
when(mockEthereumWireProtocolConfigurationBuilder.build())

29
pantheon/src/test/java/tech/pegasys/pantheon/cli/PantheonCommandTest.java
Unescape View File

@ -59,7 +59,6 @@ import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.time.Duration;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@ -307,7 +306,6 @@ public class PantheonCommandTest extends CommandTestAbstract {
verify(mockSyncConfBuilder).syncMode(eq(SyncMode.FAST));
verify(mockSyncConfBuilder).fastSyncMinimumPeerCount(eq(13));
verify(mockSyncConfBuilder).fastSyncMaximumPeerWaitTime(eq(Duration.ofSeconds(57)));
assertThat(commandOutput.toString()).isEmpty();
assertThat(commandErrorOutput.toString()).isEmpty();
@ -614,7 +612,6 @@ public class PantheonCommandTest extends CommandTestAbstract {
verify(mockSyncConfBuilder).syncMode(eq(SyncMode.FULL));
verify(mockSyncConfBuilder).fastSyncMinimumPeerCount(eq(5));
verify(mockSyncConfBuilder).fastSyncMaximumPeerWaitTime(eq(Duration.ofSeconds(0)));
assertThat(commandErrorOutput.toString()).isEmpty();
@ -1063,27 +1060,6 @@ public class PantheonCommandTest extends CommandTestAbstract {
assertThat(commandErrorOutput.toString()).isEmpty();
}
@Test
public void parsesValidFastSyncTimeoutOption() {
parseCommand("--sync-mode", "FAST", "--fast-sync-max-wait-time", "17");
verify(mockSyncConfBuilder).syncMode(eq(SyncMode.FAST));
verify(mockSyncConfBuilder).fastSyncMaximumPeerWaitTime(eq(Duration.ofSeconds(17)));
assertThat(commandOutput.toString()).isEmpty();
assertThat(commandErrorOutput.toString()).isEmpty();
}
@Test
public void parsesInvalidFastSyncTimeoutOptionShouldFail() {
parseCommand("--sync-mode", "FAST", "--fast-sync-max-wait-time", "-1");
verifyZeroInteractions(mockRunnerBuilder);
assertThat(commandOutput.toString()).isEmpty();
assertThat(commandErrorOutput.toString())
.contains("--fast-sync-max-wait-time must be greater than or equal to 0");
}
@Test
public void parsesValidFastSyncMinPeersOption() {
@ -1268,10 +1244,9 @@ public class PantheonCommandTest extends CommandTestAbstract {
@Test
public void fastSyncOptionsRequiresFastSyncModeToBeSet() {
parseCommand("--fast-sync-min-peers", "5", "--fast-sync-max-wait-time", "30");
parseCommand("--fast-sync-min-peers", "5");
verifyOptionsConstraintLoggerCall(
"--sync-mode", "--fast-sync-min-peers", "--fast-sync-max-wait-time");
verifyOptionsConstraintLoggerCall("--sync-mode", "--fast-sync-min-peers");
assertThat(commandOutput.toString()).isEmpty();
assertThat(commandErrorOutput.toString()).isEmpty();

1
pantheon/src/test/resources/complete_config.toml
Unescape View File

@ -28,7 +28,6 @@ genesis-file="~/genesis.json" # Path
network-id=42
sync-mode="fast"# should be FAST or FULL (or fast or full)
fast-sync-min-peers=13
fast-sync-max-wait-time=57
ottoman=false # true means using ottoman testnet if genesis file uses iBFT
#mining

1
pantheon/src/test/resources/everything_config.toml
Unescape View File

@ -33,7 +33,6 @@ network="MAINNET"
genesis-file="~/genesis.json"
sync-mode="fast"
fast-sync-min-peers=5
fast-sync-max-wait-time=30
network-id=303
# JSON-RPC

Write Preview
Loading…
Cancel
Save