Skip to content

Commit 137d07a

Browse files
committed
Delete MY_REGION_DIR, then mkdir
1 parent b67778b commit 137d07a

6 files changed

+36
-42
lines changed

tools/hammer_loop.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,14 @@ fi
4343

4444
REGION_ROOT=${REGION_ROOT:-/var/tmp}
4545
MY_REGION_ROOT=${REGION_ROOT}/hammer_loop
46-
if [[ ! -d "$MY_REGION_ROOT" ]]; then
47-
mkdir -p "$MY_REGION_ROOT"
48-
if [[ $? -ne 0 ]]; then
49-
echo "Failed to make region root $MY_REGION_ROOT"
50-
exit 1
51-
fi
52-
else
46+
if [[ -d "$MY_REGION_ROOT" ]]; then
5347
rm -rf "$MY_REGION_ROOT"
5448
fi
49+
mkdir -p "$MY_REGION_ROOT"
50+
if [[ $? -ne 0 ]]; then
51+
echo "Failed to make region root $MY_REGION_ROOT"
52+
exit 1
53+
fi
5554

5655
loop_log="$TEST_ROOT/hammer_loop.log"
5756
test_log="$TEST_ROOT/hammer_loop_test.log"

tools/test_live_repair.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ function ctrl_c() {
2323

2424
REGION_ROOT=${REGION_ROOT:-/var/tmp}
2525
MY_REGION_ROOT=${REGION_ROOT}/test_live_repair
26-
if [[ ! -d "$MY_REGION_ROOT" ]]; then
27-
mkdir -p "$MY_REGION_ROOT"
28-
if [[ $? -ne 0 ]]; then
29-
echo "Failed to make region root $MY_REGION_ROOT"
30-
exit 1
31-
fi
32-
else
26+
if [[ -d "$MY_REGION_ROOT" ]]; then
3327
rm -rf "$MY_REGION_ROOT"
3428
fi
29+
mkdir -p "$MY_REGION_ROOT"
30+
if [[ $? -ne 0 ]]; then
31+
echo "Failed to make region root $MY_REGION_ROOT"
32+
exit 1
33+
fi
3534

3635
# Location of logs and working files
3736
WORK_ROOT=${WORK_ROOT:-/tmp}

tools/test_repair.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,14 @@ done
4343
# For buildomat, the regions should be in /var/tmp
4444
REGION_ROOT=${REGION_ROOT:-/var/tmp}
4545
MY_REGION_ROOT=${REGION_ROOT}/test_repair
46-
if [[ ! -d "$MY_REGION_ROOT" ]]; then
47-
mkdir -p "$MY_REGION_ROOT"
48-
if [[ $? -ne 0 ]]; then
49-
echo "Failed to make region root $MY_REGION_ROOT"
50-
exit 1
51-
fi
52-
else
46+
if [[ -d "$MY_REGION_ROOT" ]]; then
5347
rm -rf "$MY_REGION_ROOT"
5448
fi
49+
mkdir -p "$MY_REGION_ROOT"
50+
if [[ $? -ne 0 ]]; then
51+
echo "Failed to make region root $MY_REGION_ROOT"
52+
exit 1
53+
fi
5554

5655
# Location of logs and working files
5756
WORK_ROOT=${WORK_ROOT:-/tmp}

tools/test_replace_special.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@ function ctrl_c() {
1919

2020
REGION_ROOT=${REGION_ROOT:-/var/tmp}
2121
MY_REGION_ROOT=${REGION_ROOT}/test_replace_special
22-
if [[ ! -d "$MY_REGION_ROOT" ]]; then
23-
mkdir -p "$MY_REGION_ROOT"
24-
if [[ $? -ne 0 ]]; then
25-
echo "Failed to make region root $MY_REGION_ROOT"
26-
exit 1
27-
fi
28-
else
22+
if [[ -d "$MY_REGION_ROOT" ]]; then
2923
rm -rf "$MY_REGION_ROOT"
3024
fi
25+
mkdir -p "$MY_REGION_ROOT"
26+
if [[ $? -ne 0 ]]; then
27+
echo "Failed to make region root $MY_REGION_ROOT"
28+
exit 1
29+
fi
3130

3231
# Location of logs and working files
3332
WORK_ROOT=${WORK_ROOT:-/tmp}

tools/test_replay.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ function ctrl_c() {
1717

1818
REGION_ROOT=${REGION_ROOT:-/var/tmp}
1919
MY_REGION_ROOT=${REGION_ROOT}/test_replay
20-
if [[ ! -d "$MY_REGION_ROOT" ]]; then
21-
mkdir -p "$MY_REGION_ROOT"
22-
if [[ $? -ne 0 ]]; then
23-
echo "Failed to make region root $MY_REGION_ROOT"
24-
exit 1
25-
fi
26-
else
20+
if [[ -d "$MY_REGION_ROOT" ]]; then
2721
rm -rf "$MY_REGION_ROOT"
2822
fi
23+
mkdir -p "$MY_REGION_ROOT"
24+
if [[ $? -ne 0 ]]; then
25+
echo "Failed to make region root $MY_REGION_ROOT"
26+
exit 1
27+
fi
2928

3029
WORK_ROOT=${WORK_ROOT:-/tmp}
3130
TEST_ROOT="$WORK_ROOT/test_replay"

tools/test_restart_repair.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,14 @@ done
9999

100100
REGION_ROOT=${REGION_ROOT:-/var/tmp}
101101
MY_REGION_ROOT=${REGION_ROOT}/test_restart_repair
102-
if [[ ! -d "$MY_REGION_ROOT" ]]; then
103-
mkdir -p "$MY_REGION_ROOT"
104-
if [[ $? -ne 0 ]]; then
105-
echo "Failed to make region root $MY_REGION_ROOT"
106-
exit 1
107-
fi
108-
else
102+
if [[ -d "$MY_REGION_ROOT" ]]; then
109103
rm -rf "$MY_REGION_ROOT"
110104
fi
105+
mkdir -p "$MY_REGION_ROOT"
106+
if [[ $? -ne 0 ]]; then
107+
echo "Failed to make region root $MY_REGION_ROOT"
108+
exit 1
109+
fi
111110

112111
WORK_ROOT=${WORK_ROOT:-/tmp}
113112
TEST_ROOT="$WORK_ROOT/test_restart_repair"

0 commit comments

Comments
 (0)