Skip to content

Commit b1739ae

Browse files
committed
raftengine: address snapshot queue sizing and migration temp dir review
- Reduce snapshotReqCh buffer from 8 to 1 to match the snapshotInFlight guard that already limits concurrency to a single in-flight snapshot. - Use mktemp on remote hosts in engine-migrate.sh instead of hardcoded /tmp paths to avoid conflicts between concurrent runs.
1 parent acd4637 commit b1739ae

2 files changed

Lines changed: 4 additions & 6 deletions

File tree

internal/raftengine/etcd/engine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const (
2727
defaultMaxSizePerMsg = 1 << 20
2828
defaultDispatchWorkers = 4
2929
defaultSnapshotEvery = 10_000
30-
defaultSnapshotQueueSize = 8
30+
defaultSnapshotQueueSize = 1
3131
defaultAdminPollInterval = 10 * time.Millisecond
3232
defaultMaxPendingConfigs = 64
3333
unknownLastContact = time.Duration(-1)

scripts/engine-migrate.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ set -euo pipefail
259259
260260
node_dir="${DATA_DIR%/}/${NODE_ID}"
261261
fsm_store="${node_dir}/fsm.db"
262-
migrate_dest="/tmp/etcd-migrate-${NODE_ID}"
263262
ts="$(date -u +%Y%m%dT%H%M%SZ)"
264263
backup_dir="${node_dir}/hashicorp-backup-${ts}"
265264
@@ -280,17 +279,16 @@ if ! sudo -n test -d "$fsm_store"; then
280279
exit 1
281280
fi
282281
283-
# Clean up any leftover temp dir from a previous failed attempt
284-
sudo -n rm -rf "$migrate_dest"
282+
migrate_dest="$(sudo -n mktemp -d "/tmp/etcd-migrate-${NODE_ID}-XXXXXX")"
285283
286284
echo " running etcd-raft-migrate"
287285
sudo -n "$MIGRATE_BIN" \
288286
-fsm-store "$fsm_store" \
289-
-dest "$migrate_dest" \
287+
-dest "${migrate_dest}/data" \
290288
-peers "$PEERS"
291289
292290
echo " moving etcd artifacts into place"
293-
sudo -n mv "${migrate_dest}/member" "${node_dir}/member"
291+
sudo -n mv "${migrate_dest}/data/member" "${node_dir}/member"
294292
sudo -n rm -rf "$migrate_dest"
295293
296294
echo " archiving hashicorp raft artifacts"

0 commit comments

Comments
 (0)