project-lakitu: increase timeout for boot disk size
optimize the shell script to take less time.
BUG=b/197867345
TEST=manual
RELEASE_NOTE=None
Change-Id: I0d455402da1c0833a065c1fba548d58c3375c6f5
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/22537
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Roy Yang <royyang@google.com>
diff --git a/project-lakitu/app-admin/node-problem-detector/files/boot-disk-size-consistency-monitor.json b/project-lakitu/app-admin/node-problem-detector/files/boot-disk-size-consistency-monitor.json
index 6de019f..7955fe7 100644
--- a/project-lakitu/app-admin/node-problem-detector/files/boot-disk-size-consistency-monitor.json
+++ b/project-lakitu/app-admin/node-problem-detector/files/boot-disk-size-consistency-monitor.json
@@ -2,7 +2,7 @@
"plugin": "custom",
"pluginConfig": {
"invoke_interval": "30m",
- "timeout": "5s",
+ "timeout": "7s",
"max_output_length": 80,
"enable_message_change_based_condition_update": false
},
@@ -13,7 +13,7 @@
"type": "temporary",
"reason": "BootDiskSizeInconsistency",
"path": "/etc/node_problem_detector/check_boot_disk_size_consistency.sh",
- "timeout": "3s"
+ "timeout": "5s"
}
]
}
diff --git a/project-lakitu/app-admin/node-problem-detector/files/check_boot_disk_size_consistency.sh b/project-lakitu/app-admin/node-problem-detector/files/check_boot_disk_size_consistency.sh
index 32e5091..9f6702f 100644
--- a/project-lakitu/app-admin/node-problem-detector/files/check_boot_disk_size_consistency.sh
+++ b/project-lakitu/app-admin/node-problem-detector/files/check_boot_disk_size_consistency.sh
@@ -10,28 +10,28 @@
readonly DISKFRACTIONMINIMUM=90
readonly ROOTDEVICE="sda1"
-if ! grep $ROOTDEVICE /proc/partitions > /dev/null; then
- echo "Error retrieving requested disk size"
- exit $UNKNOWN
+if ! requestedDiskSize="$(grep "${ROOTDEVICE}" /proc/partitions | awk 'NR == 1 {printf $3}')"; then
+ echo "Error retrieving requested disk size"
+ exit "${UNKNOWN}"
fi
-requestedDiskSize="$(grep $ROOTDEVICE /proc/partitions | awk 'NR == 1 {printf $3}')"
-if ! df -P "/dev/$ROOTDEVICE" > /dev/null; then
- echo "Error retrieving actual disk size"
- exit $UNKNOWN
+if ! actualDiskSize="$(df -P "/dev/${ROOTDEVICE}" | awk 'NR == 2 {printf $2}')"; then
+ echo "Error retrieving actual disk size"
+ exit "${UNKNOWN}"
fi
-actualDiskSize="$(df -P "/dev/$ROOTDEVICE" | awk 'NR == 2 {printf $2}')"
+
actualDiskSize=$((actualDiskSize*100))
-ratio=$(($actualDiskSize/$requestedDiskSize))
+ratio=$((${actualDiskSize}/${requestedDiskSize}))
# if the ratio of actualdiskSize to requestedDiskSize is less than 0.9, then it
-# implies there is a problem occuring during the resize2f partition.
-if [[ $ratio -lt $DISKFRACTIONMINIMUM ]]; then
- echo "DiskSizeCheck failure occured"
- exit $NONOK
+# implies there is a problem occurring during the resize2f partition.
+if [[ ${ratio} -lt ${DISKFRACTIONMINIMUM} ]]; then
+ echo "DiskSizeCheck failure occurred"
+ exit "${NONOK}"
else
echo "DiskSizeCheck is successful"
- exit $OK
+ exit "${OK}"
fi
+
diff --git a/project-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.6-r8.ebuild b/project-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.6-r9.ebuild
similarity index 100%
rename from project-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.6-r8.ebuild
rename to project-lakitu/app-admin/node-problem-detector/node-problem-detector-0.8.6-r9.ebuild
