Skip to content

K
k3s
Commit bf0d3234 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #35102 from gmarek/mount_disk

Automatic merge from submit-queue Mount disk in kubemark earlier
parents 06c0416d cde44bc0
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
test/kubemark/start-kubemark-master.sh
View file @ bf0d3234
...@@ -48,16 +48,12 @@ function mount-master-pd() { ...@@ -48,16 +48,12 @@ function mount-master-pd() {
# persistent data, and link them to where they're used. # persistent data, and link them to where they're used.
mkdir -p "${mount_point}" mkdir -p "${mount_point}"
device=$1
mountpoint=$2
# Format only if the disk is not already formatted. # Format only if the disk is not already formatted.
if ! tune2fs -l "${pd_path}" ; then if ! tune2fs -l "${pd_path}" ; then
echo "Formatting '${pd_path}'" echo "Formatting '${pd_path}'"
mkfs.ext4 -F -E lazy_itable_init=0,lazy_journal_init=0,discard "${pd_path}" mkfs.ext4 -F -E lazy_itable_init=0,lazy_journal_init=0,discard "${pd_path}"
fi fi
mkdir -p "${mount_point}"
echo "Mounting '${pd_path}' at '${mount_point}'" echo "Mounting '${pd_path}' at '${mount_point}'"
mount -o discard,defaults "${pd_path}" "${mount_point}" mount -o discard,defaults "${pd_path}" "${mount_point}"
echo "Mounted master-pd '${pd_path}' at '${mount_point}'" echo "Mounted master-pd '${pd_path}' at '${mount_point}'"
...@@ -78,6 +74,8 @@ function mount-master-pd() { ...@@ -78,6 +74,8 @@ function mount-master-pd() {
fi fi
} }
mount-master-pd
if [ "${EVENT_STORE_IP}" == "127.0.0.1" ]; then if [ "${EVENT_STORE_IP}" == "127.0.0.1" ]; then
# Retry starting etcd to avoid pulling image errors. # Retry starting etcd to avoid pulling image errors.
retry sudo docker run --net=host \ retry sudo docker run --net=host \
...@@ -101,8 +99,6 @@ retry sudo docker run --net=host \ ...@@ -101,8 +99,6 @@ retry sudo docker run --net=host \
# Increase the allowed number of open file descriptors # Increase the allowed number of open file descriptors
ulimit -n 65536 ulimit -n 65536
mount-master-pd
tar xzf kubernetes-server-linux-amd64.tar.gz tar xzf kubernetes-server-linux-amd64.tar.gz
kubernetes/server/bin/kube-scheduler --master=127.0.0.1:8080 $(cat scheduler_flags) &> /var/log/kube-scheduler.log & kubernetes/server/bin/kube-scheduler --master=127.0.0.1:8080 $(cat scheduler_flags) &> /var/log/kube-scheduler.log &
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment