refactor: increase verbosity level of some log messages

buraksezer · buraksezer · commit 6a9245f3c57d · 2022-10-14T19:25:24.000+03:00
diff --git a/cluster_client.go b/cluster_client.go
@@ -224,7 +224,6 @@ func (dm *ClusterDMap) Incr(ctx context.Context, key string, delta int) (int, er
 	if err != nil {
 		return 0, processProtocolError(err)
 	}
-	// TODO: Consider returning uint64 as response
 	res, err := cmd.Uint64()
 	if err != nil {
 		return 0, processProtocolError(cmd.Err())
@@ -245,7 +244,6 @@ func (dm *ClusterDMap) Decr(ctx context.Context, key string, delta int) (int, er
 	if err != nil {
 		return 0, processProtocolError(err)
 	}
-	// TODO: Consider returning uint64 as response
 	res, err := cmd.Uint64()
 	if err != nil {
 		return 0, processProtocolError(cmd.Err())
@@ -343,7 +341,6 @@ func (dm *ClusterDMap) Lock(ctx context.Context, key string, deadline time.Durat
 		return nil, err
 	}
 
-	// TODO: Inconsistency: TIMEOUT, duration or second?
 	cmd := protocol.NewLock(dm.name, key, deadline.Seconds()).Command(ctx)
 	err = rc.Process(ctx, cmd)
 	if err != nil {
@@ -362,9 +359,8 @@ func (dm *ClusterDMap) Lock(ctx context.Context, key string, deadline time.Durat
 }
 
 // LockWithTimeout sets a lock for the given key. If the lock is still unreleased
-// the end of given period of time,
-// it automatically releases the lock. Acquired lock is only for the key in
-// this dmap.
+// the end of given period of time, it automatically releases the lock.
+// Acquired lock is only for the key in this DMap.
 //
 // It returns immediately if it acquires the lock for the given key. Otherwise,
 // it waits until deadline.
@@ -377,7 +373,6 @@ func (dm *ClusterDMap) LockWithTimeout(ctx context.Context, key string, timeout,
 		return nil, err
 	}
 
-	// TODO: Inconsistency: TIMEOUT, duration or second?
 	cmd := protocol.NewLock(dm.name, key, deadline.Seconds()).SetPX(timeout.Milliseconds()).Command(ctx)
 	err = rc.Process(ctx, cmd)
 	if err != nil {
@@ -414,7 +409,6 @@ func (c *ClusterLockContext) Lease(ctx context.Context, duration time.Duration)
 	if err != nil {
 		return err
 	}
-	// TODO: Inconsistency!
 	cmd := protocol.NewLockLease(c.dm.name, c.key, c.token, duration.Seconds()).Command(ctx)
 	err = rc.Process(ctx, cmd)
 	if err != nil {
diff --git a/cmd/olricd/olricd-local.yaml b/cmd/olricd/olricd-local.yaml
@@ -154,10 +154,10 @@ logging:
   # * 6 - Trace level verbosity
   #   * Context to understand the steps leading up to neterrors and warnings
   #   * More information for troubleshooting reported issues
-  verbosity: 6
+  verbosity: 3
 
   # Default LogLevel is DEBUG. Available levels: "DEBUG", "WARN", "ERROR", "INFO"
-  level: DEBUG
+  level: INFO
   output: stderr
 
 memberlist:
diff --git a/docker/olricd-consul.yaml b/docker/olricd-consul.yaml
@@ -151,10 +151,10 @@ logging:
   # * 6 - Trace level verbosity
   #   * Context to understand the steps leading up to neterrors and warnings
   #   * More information for troubleshooting reported issues
-  verbosity: 6
+  verbosity: 3
 
   # Default LogLevel is DEBUG. Available levels: "DEBUG", "WARN", "ERROR", "INFO"
-  level: DEBUG
+  level: INFO
   output: stderr
 
 memberlist:
diff --git a/internal/cluster/routingtable/distribute.go b/internal/cluster/routingtable/distribute.go
@@ -44,11 +44,11 @@ func (r *RoutingTable) distributePrimaryCopies(partID uint64) []discovery.Member
 			r.log.V(6).Printf("[DEBUG] Failed to find %s in the cluster: %v", owner, err)
 			owners = append(owners[:i], owners[i+1:]...)
 			i--
-			r.log.V(6).Printf("[INFO] Member: %s has been deleted from the primary owners list of PartID: %v", owner.String(), partID)
+			r.log.V(3).Printf("[INFO] Member: %s has been deleted from the primary owners list of PartID: %v", owner.String(), partID)
 			continue
 		}
 		if !owner.CompareByID(current) {
-			r.log.V(4).Printf("[WARN] One of the partitions owners is probably re-joined: %s", current)
+			r.log.V(3).Printf("[WARN] One of the partitions owners is probably re-joined: %s", current)
 			owners = append(owners[:i], owners[i+1:]...)
 			i--
 			continue
@@ -61,17 +61,16 @@ func (r *RoutingTable) distributePrimaryCopies(partID uint64) []discovery.Member
 		cmd := protocol.NewLengthOfPart(partID).Command(r.ctx)
 		rc := r.client.Get(owner.String())
 		err := rc.Process(r.ctx, cmd)
-		// TODO: improve logging
 		if err != nil {
-			r.log.V(3).Printf("[ERROR] Failed to check key count on backup "+
+			r.log.V(6).Printf("[DEBUG] Failed to check key count on backup "+
 				"partition: %d: %v", partID, err)
 			// Pass it. If the node is down, memberlist package will send a leave event.
 			continue
 		}
 
 		count, err := cmd.Result()
 		if err != nil {
-			r.log.V(3).Printf("[ERROR] Failed to check key count on backup "+
+			r.log.V(6).Printf("[DEBUG] Failed to check key count on backup "+
 				"partition: %d: %v", partID, err)
 			// Pass it. If the node is down, memberlist package will send a leave event.
 			continue
@@ -170,16 +169,15 @@ func (r *RoutingTable) distributeBackups(partID uint64) []discovery.Member {
 		cmd := protocol.NewLengthOfPart(partID).SetReplica().Command(r.ctx)
 		rc := r.client.Get(backup.String())
 		err := rc.Process(r.ctx, cmd)
-		// TODO: improve logging
 		if err != nil {
-			r.log.V(3).Printf("[ERROR] Failed to check key count on backup "+
+			r.log.V(6).Printf("[DEBUG] Failed to check key count on backup "+
 				"partition: %d: %v", partID, err)
 			// Pass it. If the node is down, memberlist package will send a leave event.
 			continue
 		}
 		count, err := cmd.Result()
 		if err != nil {
-			r.log.V(3).Printf("[ERROR] Failed to check key count on backup "+
+			r.log.V(6).Printf("[DEBUG] Failed to check key count on backup "+
 				"partition: %d: %v", partID, err)
 			// Pass it. If the node is down, memberlist package will send a leave event.
 			continue
diff --git a/internal/dmap/config.go b/internal/dmap/config.go
@@ -73,7 +73,7 @@ func (c *dmapConfig) load(dc *config.DMaps, name string) error {
 		}
 	}
 
-	// TODO: Create a new function to verify config config.
+	//TODO: Create a new function to verify config.
 	if c.evictionPolicy == config.LRUEviction {
 		if c.maxInuse <= 0 && c.maxKeys <= 0 {
 			return fmt.Errorf("maxInuse or maxKeys have to be greater than zero")
diff --git a/internal/dmap/delete.go b/internal/dmap/delete.go
@@ -82,7 +82,6 @@ func (dm *DMap) deleteBackupOnCluster(hkey uint64, key string) error {
 				dm.s.log.V(3).Printf("[ERROR] Failed to delete replica key/value on %s: %s", dm.name, err)
 				return protocol.ConvertError(err)
 			}
-			// TODO: Improve logging
 			return protocol.ConvertError(cmd.Err())
 		})
 	}
diff --git a/internal/dmap/destroy.go b/internal/dmap/destroy.go
@@ -52,12 +52,12 @@ func (dm *DMap) destroyOnCluster(ctx context.Context) error {
 			}
 			defer sem.Release(1)
 
-			// TODO: Improve logging
-			dm.s.log.V(6).Printf("[DEBUG] Calling Destroy command on %s for %s", addr, dm.name)
+			dm.s.log.V(6).Printf("[DEBUG] Calling DM.DESTROY command on %s for %s", addr, dm.name)
 			cmd := protocol.NewDestroy(dm.name).SetLocal().Command(dm.s.ctx)
 			rc := dm.s.client.Get(addr)
 			err := rc.Process(ctx, cmd)
 			if err != nil {
+				dm.s.log.V(3).Printf("[ERROR] DM.DESTROY returned an error: %v", err)
 				return err
 			}
 			return cmd.Err()
diff --git a/internal/dmap/eviction.go b/internal/dmap/eviction.go
@@ -44,7 +44,7 @@ func (dm *DMap) isKeyIdleOnFragment(hkey uint64, f *fragment) bool {
 	if errors.Is(err, storage.ErrKeyNotFound) {
 		return false
 	}
-	// TODO: Handle other errors.
+	//TODO: Handle other errors.
 	ttl := (dm.config.maxIdleDuration.Nanoseconds() + lastAccess) / 1000000
 	return isKeyExpired(ttl)
 }
diff --git a/internal/dmap/get.go b/internal/dmap/get.go
@@ -205,7 +205,7 @@ func (dm *DMap) lookupOnReplicas(hkey uint64, key string) []*version {
 		err = protocol.ConvertError(err)
 		if err != nil {
 			if dm.s.log.V(6).Ok() {
-				dm.s.log.V(6).Printf("[ERROR] Failed to call get on"+
+				dm.s.log.V(6).Printf("[DEBUG] Failed to call get on"+
 					" a replica owner: %s: %v", host, err)
 			}
 			continue
@@ -214,9 +214,8 @@ func (dm *DMap) lookupOnReplicas(hkey uint64, key string) []*version {
 		value, err := cmd.Bytes()
 		err = protocol.ConvertError(err)
 		if err != nil {
-			// TODO: Improve logging
 			if dm.s.log.V(6).Ok() {
-				dm.s.log.V(6).Printf("[ERROR] Failed to call get on"+
+				dm.s.log.V(6).Printf("[DEBUG] Failed to call get on"+
 					" a replica owner: %s: %v", host, err)
 			}
 		}
diff --git a/internal/dmap/get_handlers.go b/internal/dmap/get_handlers.go
@@ -68,7 +68,6 @@ func (s *Service) getEntryCommandHandler(conn redcon.Conn, cmd redcon.Command) {
 	e.hkey = partitions.HKey(getEntryCmd.DMap, getEntryCmd.Key)
 	e.kind = kind
 	nt, err := dm.getOnFragment(e)
-	// TODO: errFragmentNotFound??
 	if err == errFragmentNotFound {
 		err = ErrKeyNotFound
 	}
diff --git a/internal/dmap/put.go b/internal/dmap/put.go
@@ -302,7 +302,6 @@ func (dm *DMap) putOnCluster(e *env) error {
 			e.timeout = dm.config.ttlDuration
 		}
 		if dm.config.evictionPolicy == config.LRUEviction {
-			// TODO: What about lock?
 			if err = dm.setLRUEvictionStats(e); err != nil {
 				return err
 			}
diff --git a/internal/protocol/dmap.go b/internal/protocol/dmap.go
@@ -799,8 +799,6 @@ func ParseIncrByFloatCommand(cmd redcon.Command) (*IncrByFloat, error) {
 	), nil
 }
 
-// TODO: Add PLock
-
 type Lock struct {
 	DMap     string
 	Key      string
diff --git a/internal/pubsub/handlers_test.go b/internal/pubsub/handlers_test.go
@@ -240,7 +240,7 @@ func TestPubSub_Handler_Close(t *testing.T) {
 
 	err = ps.Ping(ctx)
 	require.Error(t, err, "redis: client is closed")
-	// TODO: Control active subscriber count
+	//TODO: Control active subscriber count
 }
 
 func TestPubSub_Handler_PubSubChannels_Without_Patterns(t *testing.T) {
diff --git a/olricd-docker.yaml b/olricd-docker.yaml
@@ -151,10 +151,10 @@ logging:
   # * 6 - Trace level verbosity
   #   * Context to understand the steps leading up to neterrors and warnings
   #   * More information for troubleshooting reported issues
-  verbosity: 6
+  verbosity: 3
 
   # Default LogLevel is DEBUG. Available levels: "DEBUG", "WARN", "ERROR", "INFO"
-  level: DEBUG
+  level: INFO
   output: stderr
 
 memberlist:

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func (c dmapConfig) load(dc config.DMaps, name string) error {`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`- // TODO: Create a new function to verify config config.`
	`76`	`+ //TODO: Create a new function to verify config.`
`77`	`77`	`if c.evictionPolicy == config.LRUEviction {`
`78`	`78`	`if c.maxInuse <= 0 && c.maxKeys <= 0 {`
`79`	`79`	`return fmt.Errorf("maxInuse or maxKeys have to be greater than zero")`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,6 @@ func (dm *DMap) deleteBackupOnCluster(hkey uint64, key string) error {`
`82`	`82`	`dm.s.log.V(3).Printf("[ERROR] Failed to delete replica key/value on %s: %s", dm.name, err)`
`83`	`83`	`return protocol.ConvertError(err)`
`84`	`84`	`}`
`85`		`- // TODO: Improve logging`
`86`	`85`	`return protocol.ConvertError(cmd.Err())`
`87`	`86`	`})`
`88`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,12 @@ func (dm *DMap) destroyOnCluster(ctx context.Context) error {`
`52`	`52`	`}`
`53`	`53`	`defer sem.Release(1)`
`54`	`54`
`55`		`- // TODO: Improve logging`
`56`		`- dm.s.log.V(6).Printf("[DEBUG] Calling Destroy command on %s for %s", addr, dm.name)`
	`55`	`+ dm.s.log.V(6).Printf("[DEBUG] Calling DM.DESTROY command on %s for %s", addr, dm.name)`
`57`	`56`	`cmd := protocol.NewDestroy(dm.name).SetLocal().Command(dm.s.ctx)`
`58`	`57`	`rc := dm.s.client.Get(addr)`
`59`	`58`	`err := rc.Process(ctx, cmd)`
`60`	`59`	`if err != nil {`
	`60`	`+ dm.s.log.V(3).Printf("[ERROR] DM.DESTROY returned an error: %v", err)`
`61`	`61`	`return err`
`62`	`62`	`}`
`63`	`63`	`return cmd.Err()`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (dm DMap) isKeyIdleOnFragment(hkey uint64, f fragment) bool {`
`44`	`44`	`if errors.Is(err, storage.ErrKeyNotFound) {`
`45`	`45`	`return false`
`46`	`46`	`}`
`47`		`- // TODO: Handle other errors.`
	`47`	`+ //TODO: Handle other errors.`
`48`	`48`	`ttl := (dm.config.maxIdleDuration.Nanoseconds() + lastAccess) / 1000000`
`49`	`49`	`return isKeyExpired(ttl)`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ func (dm DMap) lookupOnReplicas(hkey uint64, key string) []version {`
`205`	`205`	`err = protocol.ConvertError(err)`
`206`	`206`	`if err != nil {`
`207`	`207`	`if dm.s.log.V(6).Ok() {`
`208`		`- dm.s.log.V(6).Printf("[ERROR] Failed to call get on"+`
	`208`	`+ dm.s.log.V(6).Printf("[DEBUG] Failed to call get on"+`
`209`	`209`	`" a replica owner: %s: %v", host, err)`
`210`	`210`	`}`
`211`	`211`	`continue`
`@@ -214,9 +214,8 @@ func (dm DMap) lookupOnReplicas(hkey uint64, key string) []version {`
`214`	`214`	`value, err := cmd.Bytes()`
`215`	`215`	`err = protocol.ConvertError(err)`
`216`	`216`	`if err != nil {`
`217`		`- // TODO: Improve logging`
`218`	`217`	`if dm.s.log.V(6).Ok() {`
`219`		`- dm.s.log.V(6).Printf("[ERROR] Failed to call get on"+`
	`218`	`+ dm.s.log.V(6).Printf("[DEBUG] Failed to call get on"+`
`220`	`219`	`" a replica owner: %s: %v", host, err)`
`221`	`220`	`}`
`222`	`221`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,6 @@ func (s *Service) getEntryCommandHandler(conn redcon.Conn, cmd redcon.Command) {`
`68`	`68`	`e.hkey = partitions.HKey(getEntryCmd.DMap, getEntryCmd.Key)`
`69`	`69`	`e.kind = kind`
`70`	`70`	`nt, err := dm.getOnFragment(e)`
`71`		`- // TODO: errFragmentNotFound??`
`72`	`71`	`if err == errFragmentNotFound {`
`73`	`72`	`err = ErrKeyNotFound`
`74`	`73`	`}`