Fix Clair CPU Restrictions (vmware#1813)

Set a cpu quota on the Clair container. Fixes vmware#1805.
zjs · Jun 6, 2018 · abae52e · abae52e
1 parent b3ed42c
commit abae52e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/installer/build/bootable/root/etc/systemd/journald.conf.d/10-persistent.conf b/installer/build/bootable/root/etc/systemd/journald.conf.d/10-persistent.conf
diff --git a/installer/build/scripts/provisioners/provision_harbor.sh b/installer/build/scripts/provisioners/provision_harbor.sh
@@ -36,8 +36,10 @@ f = open(file, "r+")
 dataMap = yaml.safe_load(f)
 for _, s in enumerate(dataMap["services"]):
   if "restart" in dataMap["services"][s]:
-      if "always" in dataMap["services"][s]["restart"] and s != "jobservice":
-        dataMap["services"][s]["restart"] = "on-failure"
+    if "always" in dataMap["services"][s]["restart"]:
+      dataMap["services"][s]["restart"] = "on-failure"
+  if s == "clair":
+    dataMap["services"][s]["cpu_quota"] = 50000
   if "volumes" in dataMap["services"][s]:
     for kvol, vol in enumerate(dataMap["services"][s]["volumes"]):
       # Fixing up volumes in compose file.

diff --git a/installer/build/scripts/systemd/scripts/support/appliance-support.sh b/installer/build/scripts/systemd/scripts/support/appliance-support.sh
@@ -171,6 +171,8 @@ function getDiagInfo {
   commandToFile "docker images" "docker_images" "appliance"
   commandToFile "cat /run/systemd/resolve/resolv.conf" "resolv.conf" "appliance"
   commandToFile "cat /var/log/vmware/upgrade.log" "upgrade.log" "appliance"
+  commandToCompressed "dmesg" "dmesg" "appliance"
+  commandToCompressed "journalctl --no-pager" "journalctl" "appliance"
 
   commandToFile "systemctl status --no-pager docker.service" "systemctl_status_docker.service" "appliance"
   commandToCompressed "journalctl -u docker.service --no-pager" "journal_docker.service" "appliance"