enhance: init the hook when creating the proxy object

Signed-off-by: SimFG <bang.fu@zilliz.com>
milvus-io · Jul 23, 2024 · e8fb7b0 · e8fb7b0
1 parent a5deaa1
commit e8fb7b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/internal/proxy/hook_interceptor.go b/internal/proxy/hook_interceptor.go
@@ -92,10 +92,8 @@ func UnaryServerHookInterceptor() grpc.UnaryServerInterceptor {
 
 func HookInterceptor(ctx context.Context, req any, userName, fullMethod string, handler grpc.UnaryHandler) (interface{}, error) {
 	if hoo == nil {
-		if hookError := initHook(); hookError != nil {
-			logger.Error("hook error", zap.String("path", Params.ProxyCfg.SoPath.GetValue()), zap.Error(hookError))
-			hoo = defaultHook{}
-		}
+		log.Warn("hook is not initialized")
+		return nil, errors.New("hook is not initialized")
 	}
 	var (
 		newCtx   context.Context

diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go
@@ -148,6 +148,10 @@ func NewProxy(ctx context.Context, factory dependency.Factory) (*Proxy, error) {
 	}
 	node.UpdateStateCode(commonpb.StateCode_Abnormal)
 	expr.Register("proxy", node)
+	if hookError := initHook(); hookError != nil {
+		log.Warn("hook error", zap.String("path", Params.ProxyCfg.SoPath.GetValue()), zap.Error(hookError))
+		hoo = defaultHook{}
+	}
 	logutil.Logger(ctx).Debug("create a new Proxy instance", zap.Any("state", node.stateCode.Load()))
 	return node, nil
 }

diff --git a/internal/querycoordv2/utils/util.go b/internal/querycoordv2/utils/util.go
@@ -20,12 +20,13 @@ import (
 	"context"
 	"fmt"
 
+	"go.uber.org/zap"
+
 	"github.com/milvus-io/milvus/internal/proto/datapb"
 	"github.com/milvus-io/milvus/internal/querycoordv2/meta"
 	"github.com/milvus-io/milvus/internal/querycoordv2/session"
 	"github.com/milvus-io/milvus/pkg/log"
 	"github.com/milvus-io/milvus/pkg/util/merr"
-	"go.uber.org/zap"
 )
 
 // In a replica, a shard is available, if and only if: