diff --git a/base/gfspapp/app_options.go b/base/gfspapp/app_options.go index 3d26c4f94..50dac5726 100644 --- a/base/gfspapp/app_options.go +++ b/base/gfspapp/app_options.go @@ -158,7 +158,7 @@ const ( SignerFailureDeposit = "signer_Deposit_failure" SignerSuccessDeleteGlobalVirtualGroup = "signer_delete_global_virtual_group_success" - SignerFailureDeleteGlobalVirtualGroup = "signer_DeleteGlobalVirtualGroup_failure" + SignerFailureDeleteGlobalVirtualGroup = "signer_delete_global_virtual_group_failure" UploaderSuccessPutObject = "uploader_put_object_success" UploaderFailurePutObject = "uploader_put_object_failure" diff --git a/base/gfspapp/sign_server.go b/base/gfspapp/sign_server.go index 49450be43..518251a3a 100644 --- a/base/gfspapp/sign_server.go +++ b/base/gfspapp/sign_server.go @@ -294,7 +294,7 @@ func (g *GfSpBaseApp) GfSpSign(ctx context.Context, req *gfspserver.GfSpSignRequ case *gfspserver.GfSpSignRequest_Deposit: txHash, err = g.signer.Deposit(ctx, t.Deposit) if err != nil { - log.CtxErrorw(ctx, "failed to sign deposit", "error", err) + log.CtxErrorw(ctx, "failed to deposit", "error", err) metrics.ReqCounter.WithLabelValues(SignerFailureDeposit).Inc() metrics.ReqTime.WithLabelValues(SignerFailureDeposit).Observe(time.Since(startTime).Seconds()) } else { @@ -304,7 +304,7 @@ func (g *GfSpBaseApp) GfSpSign(ctx context.Context, req *gfspserver.GfSpSignRequ case *gfspserver.GfSpSignRequest_DeleteGlobalVirtualGroup: txHash, err = g.signer.DeleteGlobalVirtualGroup(ctx, t.DeleteGlobalVirtualGroup) if err != nil { - log.CtxErrorw(ctx, "failed to sign delete global virtual group", "error", err) + log.CtxErrorw(ctx, "failed to delete global virtual group", "error", err) metrics.ReqCounter.WithLabelValues(SignerFailureDeleteGlobalVirtualGroup).Inc() metrics.ReqTime.WithLabelValues(SignerFailureDeleteGlobalVirtualGroup).Observe(time.Since(startTime).Seconds()) } else { diff --git a/base/gfspclient/signer.go b/base/gfspclient/signer.go index 8633df680..156bc12dc 100644 --- a/base/gfspclient/signer.go +++ b/base/gfspclient/signer.go @@ -549,7 +549,7 @@ func (s *GfSpClient) Deposit(ctx context.Context, deposit *virtualgrouptypes.Msg conn, err := s.SignerConn(ctx) if err != nil { log.Errorw("failed to connect to signer", "error", err) - return "", ErrRPCUnknownWithDetail("client failed to connect to signer, error: " + err.Error()) + return "", ErrRPCUnknownWithDetail("client failed to connect to signer, error: ", err) } req := &gfspserver.GfSpSignRequest{ Request: &gfspserver.GfSpSignRequest_Deposit{ @@ -559,7 +559,7 @@ func (s *GfSpClient) Deposit(ctx context.Context, deposit *virtualgrouptypes.Msg resp, err := gfspserver.NewGfSpSignServiceClient(conn).GfSpSign(ctx, req) if err != nil { log.CtxErrorw(ctx, "client failed to sign deposit", "msg", deposit, "error", err) - return "", ErrRPCUnknownWithDetail("client failed to sign deposit, error: " + err.Error()) + return "", ErrRPCUnknownWithDetail("client failed to sign deposit, error: ", err) } if resp.GetErr() != nil { return "", resp.GetErr() @@ -571,7 +571,7 @@ func (s *GfSpClient) DeleteGlobalVirtualGroup(ctx context.Context, deleteGVG *vi conn, err := s.SignerConn(ctx) if err != nil { log.Errorw("failed to connect to signer", "error", err) - return "", ErrRPCUnknownWithDetail("client failed to connect to signer, error: " + err.Error()) + return "", ErrRPCUnknownWithDetail("client failed to connect to signer, error: ", err) } req := &gfspserver.GfSpSignRequest{ Request: &gfspserver.GfSpSignRequest_DeleteGlobalVirtualGroup{ @@ -581,7 +581,7 @@ func (s *GfSpClient) DeleteGlobalVirtualGroup(ctx context.Context, deleteGVG *vi resp, err := gfspserver.NewGfSpSignServiceClient(conn).GfSpSign(ctx, req) if err != nil { log.CtxErrorw(ctx, "client failed to sign delete GVG", "msg", deleteGVG, "error", err) - return "", ErrRPCUnknownWithDetail("client failed to sign delete GVG, error: " + err.Error()) + return "", ErrRPCUnknownWithDetail("client failed to sign delete GVG, error: ", err) } if resp.GetErr() != nil { return "", resp.GetErr() diff --git a/base/gfspvgmgr/virtual_group_manager.go b/base/gfspvgmgr/virtual_group_manager.go index 1c4a8da04..cae3f7645 100644 --- a/base/gfspvgmgr/virtual_group_manager.go +++ b/base/gfspvgmgr/virtual_group_manager.go @@ -556,7 +556,7 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir curTime := time.Now().Unix() if isEmpty(gvg) { - // Remove any GVG from the gvgGCMap if the stored size is no longer empty. + // Remove any GVG from the gvgGCMap if it is no longer empty. vgm.gvgGCMap.Range(func(k, v interface{}) bool { safeDeleteTime := v.(int64) if curTime > safeDeleteTime+int64(time.Minute.Seconds()) { @@ -566,12 +566,14 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir }) if !byChain { - gvg, err = vgm.chainClient.QueryGlobalVirtualGroup(context.Background(), gvg.Id) + gvgID := gvg.Id + gvg, err = vgm.chainClient.QueryGlobalVirtualGroup(context.Background(), gvgID) if err != nil { - log.Errorw("failed to query global virtual group", "error", err) + log.Errorw("failed to query global virtual group", "gvg_id", gvgID, "error", err) return } if !isEmpty(gvg) { + log.Warnw("the gvg is not empty by querying from chain ", "gvg", gvg) return } } @@ -584,8 +586,8 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir return } safeDeleteTime = val.(int64) - log.Infow("GVG will be deleted at", "safe_delete_time", safeDeleteTime) if curTime < safeDeleteTime { + log.Infow("GVG will be deleted at", "safe_delete_time", safeDeleteTime) return } log.Infow("start to delete GVG", "GVG", gvg) @@ -594,11 +596,11 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir GlobalVirtualGroupId: gvg.Id, }) if err != nil { - log.Errorw("failed to delete global virtual group", "gvgID", gvg.Id, "tx_hash", deleteGVGHash, "error", err) + log.Errorw("failed to delete global virtual group", "gvg_id", gvg.Id, "tx_hash", deleteGVGHash, "error", err) return } vgm.gvgGCMap.Delete(gvg.Id) - log.Infow("GVG is deleted onchain", "GVG", gvg, "tx_hash", deleteGVGHash) + log.Infow("successfully delete GVG", "GVG", gvg, "tx_hash", deleteGVGHash) deleted = true return } @@ -615,12 +617,14 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir }, } if !byChain { - gvg, err = vgm.chainClient.QueryGlobalVirtualGroup(context.Background(), gvg.Id) + gvgID := gvg.Id + gvg, err = vgm.chainClient.QueryGlobalVirtualGroup(context.Background(), gvgID) if err != nil { - log.Errorw("failed to query global virtual group", "error", err) + log.Errorw("failed to query global virtual group", "gvg_id", gvgID, "error", err) return } if !needDeposit(gvg, vgParams) { + log.Warnw("the gvg does not need deposit by querying from chain", gvg, gvg) return } } @@ -628,10 +632,10 @@ func (vgm *virtualGroupManager) monitorGVGUsage(gvg *virtualgrouptypes.GlobalVir var depositTxHash string depositTxHash, err = vgm.gfspClient.Deposit(context.Background(), msgDeposit) if err != nil { - log.Errorw("failed to deposit global virtual group", "gvgID", gvg.Id, "txHash", depositTxHash, "error", err) + log.Errorw("failed to deposit global virtual group", "gvg_id", gvg.Id, "tx_hash", depositTxHash, "error", err) return } - log.Infow("GVG is deposited", "GVG", gvg, "depositTxHash", depositTxHash) + log.Infow("successfully deposit GVG", "GVG", gvg, "tx_hash", depositTxHash) deposited = true return }