fix(chaos daemon): logging kvs as pair (chaos-mesh#3716)

* fix(chaos daemon): logging kv as pair fix panic: odd number of arguments passed as key-value pairs for logging Signed-off-by: STRRL <[email protected]> * chore: update CHANGELOG Signed-off-by: STRRL <[email protected]> * ci: dump cluster info anyway Signed-off-by: STRRL <[email protected]> * chore: manually setup GOMAXPROCS for tidb in integration test Signed-off-by: STRRL <[email protected]> Signed-off-by: STRRL <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]>
FingerLeader · Oct 25, 2022 · 0bac96e · 0bac96e
1 parent ee8a42d
commit 0bac96e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml
@@ -92,8 +92,14 @@ jobs:
         run: |
           bash test/integration_test/run.sh
 
-      - name: post run - print k8s info
+      - name: post run - dump kubernetes cluster info
         if: always()
         run: |
-          kubectl describe pods
-          kubectl describe pods -n chaos-mesh
+          kubectl cluster-info dump --all-namespaces --output-directory cluster-info-dump
+      - name: post run - upload kubernetes cluster info dump
+        if: always()
+        uses: actions/upload-artifact@v2
+        with:
+          name: integration-test-kubernetes-cluster-info-dump-${{ matrix.arch }}
+          path: cluster-info-dump
+          retention-days: 7
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,7 @@ For more information and how-to, see [RFC: Keep A Changelog](https://github.com/
 
 - Remove the explicit use of pingcap/log [#3674](https://github.com/chaos-mesh/chaos-mesh/pull/3674)
 - Fix typo in controller error message [#3704](https://github.com/chaos-mesh/chaos-mesh/pull/3704)
+- Fix panic when logging, log kvs as pair [#3716](https://github.com/chaos-mesh/chaos-mesh/pull/3716)
 
 ### Security
 

diff --git a/pkg/chaosdaemon/jvm_server.go b/pkg/chaosdaemon/jvm_server.go
@@ -89,7 +89,7 @@ func (s *DaemonServer) InstallJVMRules(ctx context.Context,
 				return nil, err
 			}
 
-			log.Info("copy", jar, "from source:", source, "to destination:", dest, "output:", string(output))
+			log.Info("copy", "jar name", jar, "from source", source, "to destination", dest, "output", string(output))
 		}
 	}
 

diff --git a/test/integration_test/jvm/tidb.yaml b/test/integration_test/jvm/tidb.yaml
@@ -26,9 +26,9 @@ metadata:
 spec:
   type: NodePort
   ports:
-  - port: 4000
-    targetPort: 4000
-    nodePort: 30400
+    - port: 4000
+      targetPort: 4000
+      nodePort: 30400
   selector:
     app: tidb
 ---
@@ -49,5 +49,9 @@ spec:
         app: tidb
     spec:
       containers:
-      - image: pingcap/tidb:v6.0.0
-        name: tidb
+        - image: pingcap/tidb:v6.0.0
+          name: tidb
+          env:
+            # uber-go/automaxprocs does NOT work with cgroup github in action, would let tidb panic
+            - name: GOMAXPROCS
+              value: "8"
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,7 @@ func (s *DaemonServer) InstallJVMRules(ctx context.Context, @@
     				return nil, err
     			}
-    			log.Info("copy", jar, "from source:", source, "to destination:", dest, "output:", string(output))
+    			log.Info("copy", "jar name", jar, "from source", source, "to destination", dest, "output", string(output))
     		}
     	}
@@ Expand Down @@