Merge pull request kata-containers#842 from grahamwhaley/20181023_inc…

…ontainer_memsize

metrics: density: in-container: set and store memsize

metrics/density/memory_usage_inside_container.sh

@@ -19,7 +19,9 @@ VERSIONS_FILE="${SCRIPT_PATH}/../../versions.yaml"
 ALPINE_VERSION=$("${GOPATH}/bin/yq" read "$VERSIONS_FILE" "docker_images.alpine.version")
 IMAGE="alpine:$ALPINE_VERSION"
 CMD="cat /proc/meminfo"
-TMP_FILE=$(mktemp meminfo.XXXXXXXXXX || true)
+# We specify here in 'k', as that then matches the results we get from the meminfo,
+# which makes later direct comparison easier.
+MEMSIZE=${MEMSIZE:-$((2048*1024))}
 
 function main() {
 	# Check tools/commands dependencies
@@ -30,8 +32,7 @@ function main() {
 
 	metrics_json_init
 
-	docker run --rm --runtime=$RUNTIME $IMAGE $CMD > $TMP_FILE
-	local output=$(cat $TMP_FILE)
+	local output=$(docker run -m ${MEMSIZE}k --rm --runtime=$RUNTIME $IMAGE $CMD)
 
 	# Save configuration
 	metrics_json_start_array
@@ -45,6 +46,10 @@ function main() {
 
 	local json="$(cat << EOF
 	{
+		"memrequest": {
+			"Result" : $MEMSIZE,
+			"Units"  : "Kb"
+		},
 		"memtotal": {
 			"Result" : $memtotal,
 			"Units"  : "$units_memtotal"
@@ -65,7 +70,6 @@ EOF
 	metrics_json_end_array "Results"
 	metrics_json_save
 	clean_env
-	rm -f $TMP_FILE
 }
 
 main "$@"