From 20f3d184588fdfda1d48a94421e4a88a19e06641 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2019 23:53:14 -0700 Subject: [PATCH] Save snapshots followed by accounts to avoid stale account data (#4847) (#4849) automerge --- multinode-demo/fullnode.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/multinode-demo/fullnode.sh b/multinode-demo/fullnode.sh index ed5dd9fe1d..f28c5f3c05 100755 --- a/multinode-demo/fullnode.sh +++ b/multinode-demo/fullnode.sh @@ -489,7 +489,13 @@ while true; do new_state_archive="$SOLANA_RSYNC_CONFIG_DIR"/new_state.tgz ( rm -rf "$new_state_dir" "$new_state_archive" - cp -a "$state_dir" "$new_state_dir" + mkdir -p "$new_state_dir" + # When saving the state, its necessary to have the snapshots be saved first + # followed by the accounts folder. This would avoid conditions where incomplete + # accounts gets picked while its still in the process of being updated and are + # not frozen yet. + cp -a "$state_dir"/snapshots "$new_state_dir" + cp -a "$state_dir"/accounts "$new_state_dir" cd "$new_state_dir" tar zcfS "$new_state_archive" ./* )