From 67f6787f7a270ec1e5fae5401ddbe7975fa39c47 Mon Sep 17 00:00:00 2001
From: Brooks Prumo <brooks@prumo.org>
Date: Wed, 9 Feb 2022 13:26:35 -0600
Subject: [PATCH] Enable incremental snapshots by default (#22938)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 ci/run-sanity.sh                      |  2 +-
 multinode-demo/bootstrap-validator.sh |  1 +
 multinode-demo/validator.sh           |  1 +
 validator/src/main.rs                 | 20 ++++++++++++++++++--
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/ci/run-sanity.sh b/ci/run-sanity.sh
index 1c74499b1..cf19d8d6f 100755
--- a/ci/run-sanity.sh
+++ b/ci/run-sanity.sh
@@ -7,7 +7,7 @@ source multinode-demo/common.sh
 
 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=$!
 
 attempts=20
diff --git a/multinode-demo/bootstrap-validator.sh b/multinode-demo/bootstrap-validator.sh
index 3b8fffb39..f8d907730 100755
--- a/multinode-demo/bootstrap-validator.sh
+++ b/multinode-demo/bootstrap-validator.sh
@@ -123,6 +123,7 @@ args+=(
   --ledger "$ledger_dir"
   --rpc-port 8899
   --snapshot-interval-slots 200
+  --no-incremental-snapshots
   --identity "$identity"
   --vote-account "$vote_account"
   --rpc-faucet-address 127.0.0.1:9900
diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh
index b3ff2fdf6..362ef03dc 100755
--- a/multinode-demo/validator.sh
+++ b/multinode-demo/validator.sh
@@ -249,6 +249,7 @@ default_arg --vote-account "$vote_account"
 default_arg --ledger "$ledger_dir"
 default_arg --log -
 default_arg --full-rpc-api
+default_arg --no-incremental-snapshots
 
 if [[ $maybeRequireTower = true ]]; then
   default_arg --require-tower
diff --git a/validator/src/main.rs b/validator/src/main.rs
index 86d4aaac9..d4acb7db6 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -795,11 +795,24 @@ pub fn main() {
             Arg::with_name("incremental_snapshots")
                 .long("incremental-snapshots")
                 .takes_value(false)
+                .hidden(true)
+                .conflicts_with("no_incremental_snapshots")
+                .help("Enable incremental snapshots")
                 .long_help("Enable 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::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::with_name("incremental_snapshot_interval_slots")
                 .long("incremental-snapshot-interval-slots")
@@ -1910,7 +1923,7 @@ pub fn main() {
             "max_genesis_archive_unpacked_size",
             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");
@@ -2373,7 +2386,7 @@ pub fn main() {
         value_t_or_exit!(matches, "incremental_snapshot_interval_slots", u64);
     let (full_snapshot_archive_interval_slots, incremental_snapshot_archive_interval_slots) =
         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),
                     incremental_snapshot_interval_slots,
@@ -2420,6 +2433,9 @@ pub fn main() {
 
         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") {
         let limit_ledger_size = match matches.value_of("limit_ledger_size") {