Enable incremental snapshots by default (#22938)
Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
parent
226a71f073
commit
67f6787f7a
|
@ -7,7 +7,7 @@ source multinode-demo/common.sh
|
||||||
|
|
||||||
rm -rf config/run/init-completed config/ledger config/snapshot-ledger
|
rm -rf config/run/init-completed config/ledger config/snapshot-ledger
|
||||||
|
|
||||||
SOLANA_RUN_SH_VALIDATOR_ARGS="--snapshot-interval-slots 200" timeout 120 ./scripts/run.sh &
|
SOLANA_RUN_SH_VALIDATOR_ARGS="--full-snapshot-interval-slots 200" timeout 120 ./scripts/run.sh &
|
||||||
pid=$!
|
pid=$!
|
||||||
|
|
||||||
attempts=20
|
attempts=20
|
||||||
|
|
|
@ -123,6 +123,7 @@ args+=(
|
||||||
--ledger "$ledger_dir"
|
--ledger "$ledger_dir"
|
||||||
--rpc-port 8899
|
--rpc-port 8899
|
||||||
--snapshot-interval-slots 200
|
--snapshot-interval-slots 200
|
||||||
|
--no-incremental-snapshots
|
||||||
--identity "$identity"
|
--identity "$identity"
|
||||||
--vote-account "$vote_account"
|
--vote-account "$vote_account"
|
||||||
--rpc-faucet-address 127.0.0.1:9900
|
--rpc-faucet-address 127.0.0.1:9900
|
||||||
|
|
|
@ -249,6 +249,7 @@ default_arg --vote-account "$vote_account"
|
||||||
default_arg --ledger "$ledger_dir"
|
default_arg --ledger "$ledger_dir"
|
||||||
default_arg --log -
|
default_arg --log -
|
||||||
default_arg --full-rpc-api
|
default_arg --full-rpc-api
|
||||||
|
default_arg --no-incremental-snapshots
|
||||||
|
|
||||||
if [[ $maybeRequireTower = true ]]; then
|
if [[ $maybeRequireTower = true ]]; then
|
||||||
default_arg --require-tower
|
default_arg --require-tower
|
||||||
|
|
|
@ -795,11 +795,24 @@ pub fn main() {
|
||||||
Arg::with_name("incremental_snapshots")
|
Arg::with_name("incremental_snapshots")
|
||||||
.long("incremental-snapshots")
|
.long("incremental-snapshots")
|
||||||
.takes_value(false)
|
.takes_value(false)
|
||||||
|
.hidden(true)
|
||||||
|
.conflicts_with("no_incremental_snapshots")
|
||||||
|
.help("Enable incremental snapshots")
|
||||||
.long_help("Enable incremental snapshots by setting this flag. \
|
.long_help("Enable incremental snapshots by setting this flag. \
|
||||||
When enabled, --snapshot-interval-slots will set the \
|
When enabled, --snapshot-interval-slots will set the \
|
||||||
incremental snapshot interval. To set the full snapshot \
|
incremental snapshot interval. To set the full snapshot \
|
||||||
interval, use --full-snapshot-interval-slots.")
|
interval, use --full-snapshot-interval-slots.")
|
||||||
)
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("no_incremental_snapshots")
|
||||||
|
.long("no-incremental-snapshots")
|
||||||
|
.takes_value(false)
|
||||||
|
.help("Disable incremental snapshots")
|
||||||
|
.long_help("Disable incremental snapshots by setting this flag. \
|
||||||
|
When enabled, --snapshot-interval-slots will set the \
|
||||||
|
incremental snapshot interval. To set the full snapshot \
|
||||||
|
interval, use --full-snapshot-interval-slots.")
|
||||||
|
)
|
||||||
.arg(
|
.arg(
|
||||||
Arg::with_name("incremental_snapshot_interval_slots")
|
Arg::with_name("incremental_snapshot_interval_slots")
|
||||||
.long("incremental-snapshot-interval-slots")
|
.long("incremental-snapshot-interval-slots")
|
||||||
|
@ -1910,7 +1923,7 @@ pub fn main() {
|
||||||
"max_genesis_archive_unpacked_size",
|
"max_genesis_archive_unpacked_size",
|
||||||
u64
|
u64
|
||||||
),
|
),
|
||||||
incremental_snapshot_fetch: matches.is_present("incremental_snapshots"),
|
incremental_snapshot_fetch: !matches.is_present("no_incremental_snapshots"),
|
||||||
};
|
};
|
||||||
|
|
||||||
let private_rpc = matches.is_present("private_rpc");
|
let private_rpc = matches.is_present("private_rpc");
|
||||||
|
@ -2373,7 +2386,7 @@ pub fn main() {
|
||||||
value_t_or_exit!(matches, "incremental_snapshot_interval_slots", u64);
|
value_t_or_exit!(matches, "incremental_snapshot_interval_slots", u64);
|
||||||
let (full_snapshot_archive_interval_slots, incremental_snapshot_archive_interval_slots) =
|
let (full_snapshot_archive_interval_slots, incremental_snapshot_archive_interval_slots) =
|
||||||
if incremental_snapshot_interval_slots > 0 {
|
if incremental_snapshot_interval_slots > 0 {
|
||||||
if matches.is_present("incremental_snapshots") {
|
if !matches.is_present("no_incremental_snapshots") {
|
||||||
(
|
(
|
||||||
value_t_or_exit!(matches, "full_snapshot_interval_slots", u64),
|
value_t_or_exit!(matches, "full_snapshot_interval_slots", u64),
|
||||||
incremental_snapshot_interval_slots,
|
incremental_snapshot_interval_slots,
|
||||||
|
@ -2420,6 +2433,9 @@ pub fn main() {
|
||||||
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
if matches.is_present("incremental_snapshots") {
|
||||||
|
warn!("--incremental-snapshots is now the default behavior. This flag is deprecated and can be removed from the launch args")
|
||||||
|
}
|
||||||
|
|
||||||
if matches.is_present("limit_ledger_size") {
|
if matches.is_present("limit_ledger_size") {
|
||||||
let limit_ledger_size = match matches.value_of("limit_ledger_size") {
|
let limit_ledger_size = match matches.value_of("limit_ledger_size") {
|
||||||
|
|
Loading…
Reference in New Issue