[pull] master from netdata:master

CMakeLists.txt

@@ -953,6 +953,10 @@ set(LIBNETDATA_FILES
         src/libnetdata/locks/waitq.h
         src/libnetdata/object-state/object-state.c
         src/libnetdata/object-state/object-state.h
+        src/libnetdata/locks/benchmark.c
+        src/libnetdata/locks/benchmark.h
+        src/libnetdata/locks/benchmark-rw.c
+        src/libnetdata/locks/benchmark-rw.h
 )
 
 set(LIBH2O_FILES

src/collectors/cgroups.plugin/cgroup-name.sh.in

@@ -119,13 +119,21 @@ function parse_docker_like_inspect_output() {
   if [ -n "${IMAGE_NAME}" ]; then
     LABELS="image=\"${IMAGE_NAME}\""
   fi
+
+  while IFS= read -r line; do
+    if [[ -n "$line" && $line == LABEL_netdata.cloud/* ]]; then
+      IFS="=" read -r lname lval <<<"$line"
+      lname=${lname#LABEL_}
+      LABELS="$LABELS,${lname}=\"${lval}\""
+    fi
+  done <<<"$output"
 }
 
 function docker_like_get_name_command() {
   local command="${1}"
   local id="${2}"
-  info "Running command: ${command} inspect --format='{{range .Config.Env}}{{println .}}{{end}}CONT_NAME={{ .Name}}' \"${id}\""
-  if OUTPUT="$(${command} inspect --format='{{range .Config.Env}}{{println .}}{{end}}CONT_NAME={{ .Name}}{{println}}IMAGE_NAME={{ .Config.Image}}' "${id}")" &&
+  # shellcheck disable=SC2016
+  if OUTPUT="$(${command} inspect --format='{{range .Config.Env}}{{println .}}{{end}}{{range $key, $value := .Config.Labels}}LABEL_{{$key}}={{$value}}{{println}}{{end}}IMAGE_NAME={{.Config.Image}}{{println}}CONT_NAME={{.Name}}' "${id}")" &&
     [ -n "$OUTPUT" ]; then
       parse_docker_like_inspect_output "$OUTPUT"
   fi
@@ -151,7 +159,7 @@ function docker_like_get_name_api() {
     info "Running API command: curl \"${host}${path}\""
     JSON=$(curl -sS "${host}${path}")
   fi
-  if OUTPUT=$(echo "${JSON}" | jq -r '.Config.Env[]?,"CONT_NAME=\(.Name)","IMAGE_NAME=\(.Config.Image)"') && [ -n "$OUTPUT" ]; then
+  if OUTPUT=$(echo "${JSON}" | jq -r '.Config.Env[]?, "CONT_NAME=\(.Name)", "IMAGE_NAME=\(.Config.Image)", (.Config.Labels | to_entries[] | "LABEL_\(.key)=\(.value)")') && [ -n "$OUTPUT" ]; then
     parse_docker_like_inspect_output "$OUTPUT"
   fi
   return 0
@@ -424,7 +432,7 @@ function k8s_get_kubepod_name() {
     jq_filter+='namespace=\"\(.metadata.namespace)\",'
     jq_filter+='pod_name=\"\(.metadata.name)\",'
     jq_filter+='pod_uid=\"\(.metadata.uid)\",'
-    #jq_filter+='\(.metadata.labels | to_entries | map("pod_label_"+.key+"=\""+.value+"\"") | join(",") | if length > 0 then .+"," else . end)'
+    jq_filter+='\((.metadata.annotations // {}) | to_entries | map(select(.key | startswith("netdata.cloud/")) | .key+"=\""+.value+"\"") | join(",") | if length > 0 then .+"," else . end)'
     jq_filter+='\((.metadata.ownerReferences[]? | select(.controller==true) | "controller_kind=\""+.kind+"\",controller_name=\""+.name+"\",") // "")'
     jq_filter+='node_name=\"\(.spec.nodeName)\",'
     jq_filter+='" + '

src/daemon/main.c

@@ -403,6 +403,14 @@ int netdata_main(int argc, char **argv) {
                             unittest_running = true;
                             return unittest_waiting_queue();
                         }
+                        else if(strcmp(optarg, "lockstest") == 0) {
+                            unittest_running = true;
+                            return locks_stress_test();
+                        }
+                        else if(strcmp(optarg, "rwlockstest") == 0) {
+                            unittest_running = true;
+                            return rwlocks_stress_test();
+                        }
                         else if(strcmp(optarg, "stringtest") == 0)  {
                             unittest_running = true;
                             return string_unittest(10000);

src/libnetdata/libnetdata.h

@@ -16,7 +16,8 @@ extern "C" {
 
 #include "atomics/atomics.h"
 #include "libjudy/judy-malloc.h"
-
+#include "locks/benchmark.h"
+#include "locks/benchmark-rw.h"
 #include "object-state/object-state.h"
 #include "storage-point.h"
 #include "paths/paths.h"