From 1fc30d02e195cfb94c3e6adf0778e985efea14ec Mon Sep 17 00:00:00 2001
From: GuokeCui <jingjinglake@gmail.com>
Date: Wed, 31 Aug 2022 15:17:07 +0800
Subject: [PATCH] Add log for pkg/hakeeper/checkers/dnservice; (#4800)
- Add log for `pkg/hakeeper/checkers/dnservice`
Approved by: @lni
---
pkg/hakeeper/checkers/dnservice/check.go | 37 ++++++++++++++++--------
pkg/hakeeper/checkers/dnservice/parse.go | 6 ++++
2 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/pkg/hakeeper/checkers/dnservice/check.go b/pkg/hakeeper/checkers/dnservice/check.go
index ea75f826f..fa12a4b4c 100644
--- a/pkg/hakeeper/checkers/dnservice/check.go
+++ b/pkg/hakeeper/checkers/dnservice/check.go
@@ -17,14 +17,21 @@ package dnservice
import (
"sort"
+ "github.com/lni/dragonboat/v4/logger"
+
"github.com/matrixorigin/matrixone/pkg/hakeeper"
"github.com/matrixorigin/matrixone/pkg/hakeeper/checkers/util"
"github.com/matrixorigin/matrixone/pkg/hakeeper/operator"
pb "github.com/matrixorigin/matrixone/pkg/pb/logservice"
)
-// waitingShards makes check logic stateful.
-var waitingShards *initialShards
+var (
+ // waitingShards makes check logic stateful.
+ waitingShards *initialShards
+
+ // logger for dnservice checker
+ log = logger.GetLogger("dnchecker")
+)
func init() {
waitingShards = newInitialShards()
@@ -42,7 +49,7 @@ func Check(
) []*operator.Operator {
stores, reportedShards := parseDnState(cfg, dnState, currTick)
if len(stores.WorkingStores()) < 1 {
- // warning with no working store
+ log.Warningf("no working dn stores")
return nil
}
@@ -77,41 +84,47 @@ func checkShard(
case 0: // need add replica
newReplicaID, ok := idAlloc.Next()
if !ok {
- // temporary failure when allocate replica ID
+ log.Warningf("fail to allocate replica ID")
return nil
}
target, err := consumeLeastSpareStore(workingStores)
if err != nil {
- // no working dn stores
+ log.Warningf("no working dn stores")
return nil
}
logShardID, err := mapper.getLogShardID(shard.shardID)
if err != nil {
- // warning with un-recorded shard
+ log.Warningf("shard not registerd: %d", shard.shardID)
return nil
}
- return []operator.OpStep{
- newAddStep(target, shard.shardID, newReplicaID, logShardID),
- }
+ s := newAddStep(
+ target, shard.shardID, newReplicaID, logShardID,
+ )
+ log.Infof(s.String())
+ return []operator.OpStep{s}
+
case 1: // ignore expired replicas
return nil
+
default: // remove extra working replicas
replicas := extraWorkingReplicas(shard)
steps := make([]operator.OpStep, 0, len(replicas))
logShardID, err := mapper.getLogShardID(shard.shardID)
if err != nil {
- // warning with un-recorded shard
+ log.Warningf("shard not registerd: %d", shard.shardID)
return nil
}
for _, r := range replicas {
- steps = append(steps,
- newRemoveStep(r.storeID, r.shardID, r.replicaID, logShardID),
+ s := newRemoveStep(
+ r.storeID, r.shardID, r.replicaID, logShardID,
)
+ log.Infof(s.String())
+ steps = append(steps, s)
}
return steps
}
diff --git a/pkg/hakeeper/checkers/dnservice/parse.go b/pkg/hakeeper/checkers/dnservice/parse.go
index 5cc88b2fb..74ceb8f55 100644
--- a/pkg/hakeeper/checkers/dnservice/parse.go
+++ b/pkg/hakeeper/checkers/dnservice/parse.go
@@ -111,6 +111,9 @@ func checkReportedState(
)
}
}
+
+ log.Infof("construct %d operator for reported dn shards", len(ops))
+
return ops
}
@@ -150,6 +153,9 @@ func checkInitatingShards(
)
}
}
+
+ log.Infof("construct %d operator for initating dn shards", len(ops))
+
return ops
}
--
GitLab