-
Notifications
You must be signed in to change notification settings - Fork 5
Fix manager CT startup in local Docker setup #338
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.
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
ArshSSandhu
wants to merge
1
commit into
mieweb:main
Choose a base branch
from
ArshSSandhu:fix/manager-ct-local-startup
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,16 @@ CTID="${CTID:-100}" | |
| BRIDGE="${BRIDGE:-vmbr0}" | ||
| MANAGER_TAG="${MANAGER_TAG:-latest}" | ||
|
|
||
| # Leave the Manager CT unpinned by default. In nested Docker/WSL2, | ||
| # forcing a cores value can cause LXC to generate an invalid empty | ||
| # lxc.cgroup.cpuset.cpus line. Set MANAGER_CORES=4 to opt in. | ||
| MANAGER_CORES="${MANAGER_CORES:-}" | ||
| MANAGER_CORE_ARGS=() | ||
|
|
||
| if [ -n "$MANAGER_CORES" ]; then | ||
| MANAGER_CORE_ARGS+=(--cores="${MANAGER_CORES}") | ||
| fi | ||
|
|
||
| # Wait for pve-cluster.service to mount the Proxmox cluster filesystem | ||
| until [ -d /etc/pve/local ]; do | ||
| sleep 0.5 | ||
|
|
@@ -32,7 +42,7 @@ fi | |
| # `container-creator-init.service` attempting to bootstrap the database before | ||
| # we're ready for it. | ||
| pct create 100 "local:vztmpl/manager_${MANAGER_TAG}.tar" \ | ||
| --cores=4 \ | ||
| "${MANAGER_CORE_ARGS[@]}" \ | ||
| --features=nesting=1 \ | ||
| --hostname=manager \ | ||
| --memory=8192 \ | ||
|
|
@@ -69,8 +79,11 @@ pct push 100 \ | |
| # sorts of AppArmor and userns problems due to the nested Proxmox-in-Docker. | ||
| pct shutdown 100 | ||
| pct set 100 \ | ||
| --mp0=/opt/opensource-server,mp=/opt/opensource-server \ | ||
| --entrypoint=/sbin/init | ||
| --mp0=/opt/opensource-server,mp=/opt/opensource-server | ||
|
|
||
| # Remove the temporary emergency entrypoint before the final start so the | ||
| # Manager CT boots to the default target with networking and services enabled. | ||
| pct set 100 --delete entrypoint || true | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. If the entrypoint fails to delete we need to assume the container is in a bad state and not start it. Let this fail rather than swallowing the error with |
||
|
|
||
| # Finally we start the container back up completing this service run. | ||
| pct start 100 | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't need to support "MANAGER_CORE_ARGS". I'm fine with no CPU pinning by default for manager.