minor revise for better output

Author: CMGS

client/client.go

@@ -46,8 +46,8 @@ func dial(ctx context.Context, addr string, authConfig types.AuthConfig) (*grpc.
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithKeepaliveParams(keepalive.ClientParameters{Time: 6 * 60 * time.Second, Timeout: time.Second}),
 		grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"round_robin"}`), // This sets the initial balancing policy, see https://github.com/grpc/grpc-go/blob/v1.40.x/examples/features/load_balancing/client/main.go
-		grpc.WithUnaryInterceptor(interceptor.NewUnaryRetry(interceptor.RetryOptions{Max: 1})),
-		grpc.WithStreamInterceptor(interceptor.NewStreamRetry(interceptor.RetryOptions{Max: 1})),
+		grpc.WithUnaryInterceptor(interceptor.NewUnaryRetry(interceptor.RetryOptions{Max: 0})),
+		grpc.WithStreamInterceptor(interceptor.NewStreamRetry(interceptor.RetryOptions{Max: 0})),
 	}
 	if authConfig.Username != "" {
 		opts = append(opts, grpc.WithPerRPCCredentials(auth.NewCredential(authConfig)))

cluster/calcium/node.go

@@ -49,7 +49,7 @@ func (c *Calcium) AddNode(ctx context.Context, opts *types.AddNodeOptions) (*typ
 				return err
 			}
 			node.Resource.Capacity = res
-			_ = c.pool.Invoke(func() { c.doSendNodeMetrics(ctx, node) })
+			_ = c.pool.Invoke(func() { c.doSendNodeMetrics(context.TODO(), node) })
 			return nil
 		},
 		// rollback: remove node with resource plugins
@@ -232,7 +232,7 @@ func (c *Calcium) SetNode(ctx context.Context, opts *types.SetNodeOptions) (*typ
 				// actually we can ignore err here, if update success
 				n.Resource.Capacity, n.Resource.Usage, n.Resource.Diffs, _ = c.rmgr.GetNodeResourceInfo(ctx, node.Name, nil, false)
 				// use send to update the usage
-				_ = c.pool.Invoke(func() { c.doSendNodeMetrics(ctx, n) })
+				_ = c.pool.Invoke(func() { c.doSendNodeMetrics(context.TODO(), n) })
 				return nil
 			},
 			// rollback: update node resource capacity in reverse

cluster/calcium/pod.go

@@ -9,7 +9,7 @@ import (
 
 // AddPod add pod
 func (c *Calcium) AddPod(ctx context.Context, podname, desc string) (*types.Pod, error) {
-	logger := log.WithFunc("calcium.AddPod").WithField("podname", podname).WithField("desc", desc)
+	logger := log.WithFunc("calcium.AddPod").WithField("podname", podname)
 	if podname == "" {
 		logger.Error(ctx, types.ErrEmptyPodName)
 		return nil, types.ErrEmptyPodName

resource/cobalt/metrics.go

@@ -14,14 +14,10 @@ func (m Manager) GetMetricsDescription(ctx context.Context) ([]*plugintypes.Metr
 	var metricsDescriptions []*plugintypes.MetricsDescription
 	resps, err := call(ctx, m.plugins, func(plugin plugins.Plugin) (*plugintypes.GetMetricsDescriptionResponse, error) {
 		resp, err := plugin.GetMetricsDescription(ctx)
-		if err != nil {
-			log.Errorf(ctx, err, "plugin %+v failed to get metrics description", plugin.Name())
-		}
 		return resp, err
 	})
 
 	if err != nil {
-		log.Error(ctx, err, "failed to get metrics description")
 		return nil, err
 	}
 

resource/cobalt/node.go

@@ -31,9 +31,10 @@ func (m Manager) AddNode(ctx context.Context, nodename string, opts types.Resour
 		func(ctx context.Context) error {
 			resps, err := call(ctx, m.plugins, func(plugin plugins.Plugin) (*plugintypes.AddNodeResponse, error) {
 				r := opts[plugin.Name()]
+				logger.WithField("plugin", plugin.Name()).WithField("node", nodename).Infof(ctx, "%v", litter.Sdump(r))
 				resp, err := plugin.AddNode(ctx, nodename, r, nodeInfo)
 				if err != nil {
-					logger.Errorf(ctx, err, "node %+v plugin %+v failed to add node, req: %+v", nodename, plugin.Name(), litter.Sdump(opts))
+					logger.Errorf(ctx, err, "node %+v plugin %+v failed to add node, req: %+v", nodename, plugin.Name(), litter.Sdump(r))
 				}
 				return resp, err
 			})
@@ -48,7 +49,6 @@ func (m Manager) AddNode(ctx context.Context, nodename string, opts types.Resour
 			for plugin, resp := range resps {
 				res[plugin.Name()] = resp.Capacity
 			}
-
 			return nil
 		},
 		// rollback: remove node

resource/plugins/binary/binary.go

@@ -18,7 +18,7 @@ type Plugin struct {
 
 // NewPlugin .
 func NewPlugin(ctx context.Context, path string, config coretypes.Config) (*Plugin, error) {
-	p, err := filepath.Abs(ppath.Join(config.ResourcePlugin.Dir, path))
+	p, err := filepath.Abs(path)
 	if err != nil {
 		return nil, err
 	}

utils/transaction.go

@@ -25,7 +25,7 @@ func Txn(ctx context.Context, cond contextFunc, then contextFunc, rollback func(
 			return
 		}
 		if rollback == nil {
-			logger.Error(ctx, nil, "txn failed but no rollback function")
+			logger.Warn(ctx, "txn failed but no rollback function")
 			return
 		}