container/ip/port file cleanup when scaling down. more tests
This commit is contained in:
22
dokku
22
dokku
@@ -73,13 +73,13 @@ case "$1" in
|
|||||||
do
|
do
|
||||||
PROC_NAME=${line%%=*}
|
PROC_NAME=${line%%=*}
|
||||||
PROC_COUNT=${line#*=}
|
PROC_COUNT=${line#*=}
|
||||||
CONTAINER_NUM=1
|
CONTAINER_INDEX=1
|
||||||
oldids=$(get_container_ids $APP)
|
oldids=$(get_container_ids $APP)
|
||||||
|
|
||||||
while [[ $CONTAINER_NUM -le $PROC_COUNT ]];do
|
while [[ $CONTAINER_INDEX -le $PROC_COUNT ]];do
|
||||||
DOKKU_CONTAINER_ID_FILE="$DOKKU_ROOT/$APP/CONTAINER.$PROC_NAME.$CONTAINER_NUM"
|
DOKKU_CONTAINER_ID_FILE="$DOKKU_ROOT/$APP/CONTAINER.$PROC_NAME.$CONTAINER_INDEX"
|
||||||
DOKKU_IP_FILE="$DOKKU_ROOT/$APP/IP.$PROC_NAME.$CONTAINER_NUM"
|
DOKKU_IP_FILE="$DOKKU_ROOT/$APP/IP.$PROC_NAME.$CONTAINER_INDEX"
|
||||||
DOKKU_PORT_FILE="$DOKKU_ROOT/$APP/PORT.$PROC_NAME.$CONTAINER_NUM"
|
DOKKU_PORT_FILE="$DOKKU_ROOT/$APP/PORT.$PROC_NAME.$CONTAINER_INDEX"
|
||||||
|
|
||||||
# start the app
|
# start the app
|
||||||
DOCKER_ARGS=$(: | pluginhook docker-args $APP deploy)
|
DOCKER_ARGS=$(: | pluginhook docker-args $APP deploy)
|
||||||
@@ -121,8 +121,18 @@ case "$1" in
|
|||||||
|
|
||||||
# cleanup pre-migration files
|
# cleanup pre-migration files
|
||||||
rm -f $DOKKU_ROOT/$APP/CONTAINER $DOKKU_ROOT/$APP/IP $DOKKU_ROOT/$APP/PORT
|
rm -f $DOKKU_ROOT/$APP/CONTAINER $DOKKU_ROOT/$APP/IP $DOKKU_ROOT/$APP/PORT
|
||||||
CONTAINER_NUM=$(( CONTAINER_NUM + 1 ))
|
|
||||||
|
CONTAINER_INDEX=$(( CONTAINER_INDEX + 1 ))
|
||||||
done
|
done
|
||||||
|
# cleanup when we scale down
|
||||||
|
if [[ "$PROC_COUNT" == 0 ]]; then
|
||||||
|
CONTAINER_IDX_OFFSET=0
|
||||||
|
else
|
||||||
|
CONTAINER_IDX_OFFSET=$((PROC_COUNT + 1))
|
||||||
|
fi
|
||||||
|
find $DOKKU_ROOT/$APP -name "CONTAINER.$PROC_NAME.*" | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
|
||||||
|
find $DOKKU_ROOT/$APP -name "IP.$PROC_NAME.*" | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
|
||||||
|
find $DOKKU_ROOT/$APP -name "PORT.$PROC_NAME.*" | tail -n +$CONTAINER_IDX_OFFSET | xargs rm -f
|
||||||
done < "$DOKKU_SCALE_FILE"
|
done < "$DOKKU_SCALE_FILE"
|
||||||
|
|
||||||
dokku_log_info1 "Running post-deploy"
|
dokku_log_info1 "Running post-deploy"
|
||||||
|
|||||||
@@ -3,25 +3,26 @@
|
|||||||
load test_helper
|
load test_helper
|
||||||
|
|
||||||
setup() {
|
setup() {
|
||||||
deploy_app
|
create_app
|
||||||
}
|
}
|
||||||
|
|
||||||
teardown() {
|
teardown() {
|
||||||
destroy_app
|
destroy_app
|
||||||
}
|
}
|
||||||
|
|
||||||
# @test "(ps) buildstep" {
|
@test "(ps) buildstep" {
|
||||||
# # CI support: 'Ah. I just spoke with our Docker expert --
|
# CI support: 'Ah. I just spoke with our Docker expert --
|
||||||
# # looks like docker exec is built to work with docker-under-libcontainer,
|
# looks like docker exec is built to work with docker-under-libcontainer,
|
||||||
# # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
|
# but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
|
||||||
# skip "circleci does not support docker exec at the moment."
|
skip "circleci does not support docker exec at the moment."
|
||||||
# run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
|
run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
|
||||||
# echo "output: "$output
|
echo "output: "$output
|
||||||
# echo "status: "$status
|
echo "status: "$status
|
||||||
# assert_success
|
assert_success
|
||||||
# }
|
}
|
||||||
|
|
||||||
@test "(ps) buildstep" {
|
@test "(ps) buildstep" {
|
||||||
|
deploy_app
|
||||||
run bash -c "dokku ps:stop $TEST_APP"
|
run bash -c "dokku ps:stop $TEST_APP"
|
||||||
echo "output: "$output
|
echo "output: "$output
|
||||||
echo "status: "$status
|
echo "status: "$status
|
||||||
@@ -66,3 +67,52 @@ teardown() {
|
|||||||
assert_success
|
assert_success
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "(ps:scale) buildstep" {
|
||||||
|
run bash -c "dokku ps:scale $TEST_APP web=2"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
deploy_app
|
||||||
|
CIDS=""
|
||||||
|
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
|
||||||
|
CIDS+=$(< $CID_FILE)
|
||||||
|
CIDS+=" "
|
||||||
|
done
|
||||||
|
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
|
||||||
|
run bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 2"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run bash -c "dokku ps:scale $TEST_APP web=1"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
CIDS=""
|
||||||
|
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
|
||||||
|
CIDS+=$(< $CID_FILE)
|
||||||
|
CIDS+=" "
|
||||||
|
done
|
||||||
|
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
|
||||||
|
run bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 1"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run bash -c "dokku ps:scale $TEST_APP web=0"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
CIDS=""
|
||||||
|
shopt -s nullglob
|
||||||
|
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
|
||||||
|
CIDS+=$(< $CID_FILE)
|
||||||
|
CIDS+=" "
|
||||||
|
done
|
||||||
|
run bash -c "[[ -z \"$CIDS\" ]]"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,25 +3,26 @@
|
|||||||
load test_helper
|
load test_helper
|
||||||
|
|
||||||
setup() {
|
setup() {
|
||||||
deploy_app dockerfile
|
create_app
|
||||||
}
|
}
|
||||||
|
|
||||||
teardown() {
|
teardown() {
|
||||||
destroy_app
|
destroy_app
|
||||||
}
|
}
|
||||||
|
|
||||||
# @test "(ps) dockerfile" {
|
@test "(ps) dockerfile" {
|
||||||
# # CI support: 'Ah. I just spoke with our Docker expert --
|
# CI support: 'Ah. I just spoke with our Docker expert --
|
||||||
# # looks like docker exec is built to work with docker-under-libcontainer,
|
# looks like docker exec is built to work with docker-under-libcontainer,
|
||||||
# # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
|
# but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
|
||||||
# skip "circleci does not support docker exec at the moment."
|
skip "circleci does not support docker exec at the moment."
|
||||||
# run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
|
run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
|
||||||
# echo "output: "$output
|
echo "output: "$output
|
||||||
# echo "status: "$status
|
echo "status: "$status
|
||||||
# assert_success
|
assert_success
|
||||||
# }
|
}
|
||||||
|
|
||||||
@test "(ps) dockerfile" {
|
@test "(ps) dockerfile" {
|
||||||
|
deploy_app dockerfile
|
||||||
run bash -c "dokku ps:stop $TEST_APP"
|
run bash -c "dokku ps:stop $TEST_APP"
|
||||||
echo "output: "$output
|
echo "output: "$output
|
||||||
echo "status: "$status
|
echo "status: "$status
|
||||||
@@ -66,3 +67,52 @@ teardown() {
|
|||||||
assert_success
|
assert_success
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "(ps:scale) dockerfile" {
|
||||||
|
run bash -c "dokku ps:scale $TEST_APP web=2"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
deploy_app dockerfile
|
||||||
|
CIDS=""
|
||||||
|
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
|
||||||
|
CIDS+=$(< $CID_FILE)
|
||||||
|
CIDS+=" "
|
||||||
|
done
|
||||||
|
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
|
||||||
|
run bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 2"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run bash -c "dokku ps:scale $TEST_APP web=1"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
CIDS=""
|
||||||
|
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
|
||||||
|
CIDS+=$(< $CID_FILE)
|
||||||
|
CIDS+=" "
|
||||||
|
done
|
||||||
|
CIDS_PATTERN=$(echo $CIDS | sed -e "s: :|:g")
|
||||||
|
run bash -c "docker ps -q --no-trunc | egrep \"$CIDS_PATTERN\" | wc -l | grep 1"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
run bash -c "dokku ps:scale $TEST_APP web=0"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
CIDS=""
|
||||||
|
shopt -s nullglob
|
||||||
|
for CID_FILE in $DOKKU_ROOT/$TEST_APP/CONTAINER.web.*; do
|
||||||
|
CIDS+=$(< $CID_FILE)
|
||||||
|
CIDS+=" "
|
||||||
|
done
|
||||||
|
run bash -c "[[ -z \"$CIDS\" ]]"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user