Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
38a63e38
Commit
38a63e38
authored
Dec 02, 2016
by
Dawn Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set kernel.softlockup_panic =1 based on the flag.
parent
2212c421
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
0 deletions
+24
-0
common.sh
cluster/common.sh
+1
-0
config-default.sh
cluster/gce/config-default.sh
+4
-0
config-test.sh
cluster/gce/config-test.sh
+4
-0
configure-vm.sh
cluster/gce/configure-vm.sh
+1
-0
init.sls
cluster/saltbase/salt/docker/init.sls
+14
-0
No files found.
cluster/common.sh
View file @
38a63e38
...
@@ -627,6 +627,7 @@ NETWORK_PROVIDER: $(yaml-quote ${NETWORK_PROVIDER:-})
...
@@ -627,6 +627,7 @@ NETWORK_PROVIDER: $(yaml-quote ${NETWORK_PROVIDER:-})
NETWORK_POLICY_PROVIDER:
$(
yaml-quote
${
NETWORK_POLICY_PROVIDER
:-})
NETWORK_POLICY_PROVIDER:
$(
yaml-quote
${
NETWORK_POLICY_PROVIDER
:-})
PREPULL_E2E_IMAGES:
$(
yaml-quote
${
PREPULL_E2E_IMAGES
:-})
PREPULL_E2E_IMAGES:
$(
yaml-quote
${
PREPULL_E2E_IMAGES
:-})
HAIRPIN_MODE:
$(
yaml-quote
${
HAIRPIN_MODE
:-})
HAIRPIN_MODE:
$(
yaml-quote
${
HAIRPIN_MODE
:-})
SOFTLOCKUP_PANIC:
$(
yaml-quote
${
SOFTLOCKUP_PANIC
:-})
OPENCONTRAIL_TAG:
$(
yaml-quote
${
OPENCONTRAIL_TAG
:-})
OPENCONTRAIL_TAG:
$(
yaml-quote
${
OPENCONTRAIL_TAG
:-})
OPENCONTRAIL_KUBERNETES_TAG:
$(
yaml-quote
${
OPENCONTRAIL_KUBERNETES_TAG
:-})
OPENCONTRAIL_KUBERNETES_TAG:
$(
yaml-quote
${
OPENCONTRAIL_KUBERNETES_TAG
:-})
OPENCONTRAIL_PUBLIC_SUBNET:
$(
yaml-quote
${
OPENCONTRAIL_PUBLIC_SUBNET
:-})
OPENCONTRAIL_PUBLIC_SUBNET:
$(
yaml-quote
${
OPENCONTRAIL_PUBLIC_SUBNET
:-})
...
...
cluster/gce/config-default.sh
View file @
38a63e38
...
@@ -173,3 +173,7 @@ SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}"
...
@@ -173,3 +173,7 @@ SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}"
# Optional: install a default StorageClass
# Optional: install a default StorageClass
ENABLE_DEFAULT_STORAGE_CLASS
=
"
${
ENABLE_DEFAULT_STORAGE_CLASS
:-
true
}
"
ENABLE_DEFAULT_STORAGE_CLASS
=
"
${
ENABLE_DEFAULT_STORAGE_CLASS
:-
true
}
"
# TODO(dawn1107): Remove this once the flag is built into CVM image.
# Kernel panic upon soft lockup issue
SOFTLOCKUP_PANIC
=
"
${
SOFTLOCKUP_PANIC
:-
false
}
"
# true, false
cluster/gce/config-test.sh
View file @
38a63e38
...
@@ -210,3 +210,7 @@ SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}"
...
@@ -210,3 +210,7 @@ SCHEDULING_ALGORITHM_PROVIDER="${SCHEDULING_ALGORITHM_PROVIDER:-}"
# Optional: install a default StorageClass
# Optional: install a default StorageClass
ENABLE_DEFAULT_STORAGE_CLASS
=
"
${
ENABLE_DEFAULT_STORAGE_CLASS
:-
true
}
"
ENABLE_DEFAULT_STORAGE_CLASS
=
"
${
ENABLE_DEFAULT_STORAGE_CLASS
:-
true
}
"
# TODO(dawn1107): Remove this once the flag is built into CVM image.
# Kernel panic upon soft lockup issue
SOFTLOCKUP_PANIC
=
"
${
SOFTLOCKUP_PANIC
:-
true
}
"
# true, false
cluster/gce/configure-vm.sh
View file @
38a63e38
...
@@ -446,6 +446,7 @@ admission_control: '$(echo "$ADMISSION_CONTROL" | sed -e "s/'/''/g")'
...
@@ -446,6 +446,7 @@ admission_control: '$(echo "$ADMISSION_CONTROL" | sed -e "s/'/''/g")'
network_provider: '
$(
echo
"
$NETWORK_PROVIDER
"
|
sed
-e
"s/'/''/g"
)
'
network_provider: '
$(
echo
"
$NETWORK_PROVIDER
"
|
sed
-e
"s/'/''/g"
)
'
prepull_e2e_images: '
$(
echo
"
$PREPULL_E2E_IMAGES
"
|
sed
-e
"s/'/''/g"
)
'
prepull_e2e_images: '
$(
echo
"
$PREPULL_E2E_IMAGES
"
|
sed
-e
"s/'/''/g"
)
'
hairpin_mode: '
$(
echo
"
$HAIRPIN_MODE
"
|
sed
-e
"s/'/''/g"
)
'
hairpin_mode: '
$(
echo
"
$HAIRPIN_MODE
"
|
sed
-e
"s/'/''/g"
)
'
softlockup_panic: '
$(
echo
"
$SOFTLOCKUP_PANIC
"
|
sed
-e
"s/'/''/g"
)
'
opencontrail_tag: '
$(
echo
"
$OPENCONTRAIL_TAG
"
|
sed
-e
"s/'/''/g"
)
'
opencontrail_tag: '
$(
echo
"
$OPENCONTRAIL_TAG
"
|
sed
-e
"s/'/''/g"
)
'
opencontrail_kubernetes_tag: '
$(
echo
"
$OPENCONTRAIL_KUBERNETES_TAG
"
)
'
opencontrail_kubernetes_tag: '
$(
echo
"
$OPENCONTRAIL_KUBERNETES_TAG
"
)
'
opencontrail_public_subnet: '
$(
echo
"
$OPENCONTRAIL_PUBLIC_SUBNET
"
)
'
opencontrail_public_subnet: '
$(
echo
"
$OPENCONTRAIL_PUBLIC_SUBNET
"
)
'
...
...
cluster/saltbase/salt/docker/init.sls
View file @
38a63e38
...
@@ -261,6 +261,20 @@ net.ipv4.ip_forward:
...
@@ -261,6 +261,20 @@ net.ipv4.ip_forward:
sysctl.present:
sysctl.present:
- value: 1
- value: 1
{% if pillar.get('softlockup_panic', '').lower() == 'true' %}
# TODO(dchen1107) Remove this once kernel.softlockup_panic is built into the CVM image.
/etc/sysctl.conf:
file.append:
- text:
- "kernel.softlockup_panic = 1"
- "kernel.softlockup_all_cpu_backtrace = 1"
'sysctl-reload':
cmd.run:
- name: 'sysctl --system'
- unless: 'sysctl -a | grep "kernel.softlockup_panic = 1"'
{% endif %}
{{ environment_file }}:
{{ environment_file }}:
file.managed:
file.managed:
- source: salt://docker/docker-defaults
- source: salt://docker/docker-defaults
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment