fix: allow cancel of decom only when its in progress (#17607)

This commit is contained in:
Harshavardhana
2023-07-10 07:55:38 -07:00
committed by GitHub
parent af3d99e35f
commit dfd7cca0d2
6 changed files with 28 additions and 15 deletions

View File

@@ -84,7 +84,7 @@ remote_arn=$(./mc replicate ls sitea/bucket --json | jq -r .rule.Destination.Buc
sleep 1
./mc replicate resync start sitea/bucket/ --remote-bucket "${remote_arn}"
sleep 20s ## sleep for 20s idea is that we give 200ms per object.
sleep 30s ## sleep for 30s idea is that we give 300ms per object.
count=$(./mc replicate resync status sitea/bucket --remote-bucket "${remote_arn}" --json | jq .resyncInfo.target[].replicationCount)
@@ -99,7 +99,7 @@ if [ $ret -ne 0 ]; then
fi
if [ $count -ne 12 ]; then
echo "resync not complete after 10s unexpected failure"
echo "resync not complete after 30s - unexpected failure"
./mc diff sitea/bucket siteb/bucket
exit 1
fi

View File

@@ -33,7 +33,7 @@ sleep 2
./mc admin policy create myminio/ lake ./docs/distributed/rw.json
./mc admin policy attach myminio/ rw --user=minio123
./mc admin policy attach myminio/ lake,rw --user=minio12345
./mc admin policy attach myminio/ lake --user=minio12345
./mc mb -l myminio/versioned

View File

@@ -28,7 +28,7 @@ sleep 2
./mc admin policy create myminio/ lake ./docs/distributed/rw.json
./mc admin policy attach myminio/ rw --user=minio123
./mc admin policy attach myminio/ lake,rw --user=minio12345
./mc admin policy attach myminio/ lake --user=minio12345
./mc mb -l myminio/versioned

View File

@@ -30,7 +30,7 @@ export MC_HOST_myminio="http://minioadmin:minioadmin@localhost:9000/"
./mc admin policy create myminio/ lake ./docs/distributed/rw.json
./mc admin policy attach myminio/ rw --user=minio123
./mc admin policy attach myminio/ lake,rw --user=minio12345
./mc admin policy attach myminio/ lake --user=minio12345
./mc mb -l myminio/versioned

View File

@@ -15,7 +15,7 @@ fi
export CI=true
(minio server /tmp/xl/{1...10}/disk{0...1} 2>&1 >/dev/null) &
(minio server /tmp/xl/{1...10}/disk{0...1} 2>&1 >/tmp/decom.log) &
pid=$!
sleep 2
@@ -29,7 +29,7 @@ export MC_HOST_myminio="http://minioadmin:minioadmin@localhost:9000/"
./mc admin policy create myminio/ lake ./docs/distributed/rw.json
./mc admin policy attach myminio/ rw --user=minio123
./mc admin policy attach myminio/ lake,rw --user=minio12345
./mc admin policy attach myminio/ lake --user=minio12345
./mc mb -l myminio/versioned