Skip to content

Cluster changes for wsl #6130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chands10 wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −10
Open

Cluster changes for wsl #6130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions contrib/dev-util/cluster
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function create-persist {
function interactive-init {
clean-persist
docker-sanity-check

local defsource="ubuntu:latest"
if [[ -f /etc/lsb-release ]]; then
source /etc/lsb-release
Expand Down Expand Up @@ -212,6 +212,7 @@ function build {
valgrind \
vim \
tclsh
RUN getent passwd ${uid} && userdel -r \$(getent passwd ${uid} | cut -d: -f1) || true
RUN useradd -d ${HOME} -m -u ${uid} ${id} -s /bin/bash
EOF
create-or-copy $HOME/.vimrc vimrc
Expand Down Expand Up @@ -267,7 +268,7 @@ function build {
RUN chmod -R 777 /opt/bb/
RUN chown -R ${id}:${id} ${HOME}
EOF
#if having problems with missing packages build with --no-cache=true
#if having problems with missing packages build with --no-cache=true
docker build -t comdb2:dev .
popd
rm -rf $DIR
Expand Down Expand Up @@ -302,7 +303,7 @@ function run {
name=$(container-name $i)
[[ $i -gt 0 ]] && names+=(${name})
local dbfs=""
if [[ $persist -eq 1 ]]; then
if [[ $persist -eq 1 ]]; then
dbfs="-v ${dir}/persist/${name}:/opt/bb/var"
else
dbfs="--mount type=tmpfs,destination=/opt/bb:exec"
Expand All @@ -315,7 +316,7 @@ function run {
for ((i=0;i<=$n;++i)); do
name=$(container-name $i)
cluster_cmd='echo export CLUSTER=\"'"${names[@]}"'\" >> ${HOME}/.bash_profile'
docker exec --user $(id -u) -it ${name} /bin/bash -c "${cluster_cmd}"
docker exec --user $(id -u) ${name} /bin/bash -c "${cluster_cmd}"
done

if [[ $(get auto-db) = 1 ]]; then
Expand Down Expand Up @@ -493,7 +494,7 @@ function docker-status {
err=1
fi
done
[[ $err -ne 0 ]] && return $err
[[ $err -ne 0 ]] && return $err
echo "pmux up"

for i in $(seq 1 $(get clusternum)); do
Expand All @@ -504,7 +505,7 @@ function docker-status {
err=1
fi
done
[[ $err -ne 0 ]] && return $err
[[ $err -ne 0 ]] && return $err
echo "Databases set up"

for i in $(seq 1 $(get clusternum)); do
Expand All @@ -515,7 +516,7 @@ function docker-status {
err=1
fi
done
[[ $err -ne 0 ]] && return $err
[[ $err -ne 0 ]] && return $err

echo "Databases running."
return 0
Expand Down Expand Up @@ -554,8 +555,12 @@ function usage {
exit 1
}

if [[ ! -d "${dir}" ]]; then
if [[ "$1" != "init" ]]; then
if [[ ! -d "${dir}" ]]; then
# Inside container running setup doesn't require config files
isdocker=$(cat /proc/self/cgroup | cut -d/ -f2 | head -1)
if [[ "$1" == "setup" && ( -f /.dockerenv || "$isdocker" == "docker" ) ]]; then
: # Skip config check for in-container setup
elif [[ "$1" != "init" ]]; then
echo "Can't find my config files, did you run \"$(basename $0) init\"?"
exit 1
else
Expand All @@ -566,7 +571,10 @@ if [[ ! -d "${dir}" ]]; then
fi
fi

init-globals
# Only load globals if config directory exists
if [[ -d "${dir}" ]]; then
init-globals
fi

if [[ "$1" == "build" ]]; then
build
Expand Down
Loading