Merge pull request #1159 from ydb-platform/start-stop

rename lastUsage.Touch() => lastUsage.Start()
ydb-platform · Mar 25, 2024 · 173e976 · 173e976
2 parents afd4228 + 8f774c7
commit 173e976
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/internal/conn/conn.go b/internal/conn/conn.go
@@ -326,7 +326,8 @@ func (c *conn) Invoke(
 		return c.wrapError(err)
 	}
 
-	defer c.lastUsage.Touch()()
+	stop := c.lastUsage.Start()
+	defer stop()
 
 	ctx, traceID, err := meta.TraceID(ctx)
 	if err != nil {
@@ -411,7 +412,8 @@ func (c *conn) NewStream(
 		return nil, c.wrapError(err)
 	}
 
-	defer c.lastUsage.Touch()()
+	stop := c.lastUsage.Start()
+	defer stop()
 
 	ctx, traceID, err := meta.TraceID(ctx)
 	if err != nil {

diff --git a/internal/conn/grpc_client_stream.go b/internal/conn/grpc_client_stream.go
@@ -32,7 +32,8 @@ func (s *grpcClientStream) CloseSend() (err error) {
 		onDone(err)
 	}()
 
-	defer s.c.lastUsage.Touch()()
+	stop := s.c.lastUsage.Start()
+	defer stop()
 
 	err = s.ClientStream.CloseSend()
 
@@ -65,7 +66,8 @@ func (s *grpcClientStream) SendMsg(m interface{}) (err error) {
 		onDone(err)
 	}()
 
-	defer s.c.lastUsage.Touch()()
+	stop := s.c.lastUsage.Start()
+	defer stop()
 
 	err = s.ClientStream.SendMsg(m)
 
@@ -106,7 +108,8 @@ func (s *grpcClientStream) RecvMsg(m interface{}) (err error) {
 		onDone(err)
 	}()
 
-	defer s.c.lastUsage.Touch()()
+	stop := s.c.lastUsage.Start()
+	defer stop()
 
 	defer func() {
 		if err != nil {

diff --git a/internal/conn/last_usage.go b/internal/conn/last_usage.go
@@ -35,7 +35,7 @@ func (l *lastUsage) Get() time.Time {
 	return l.clock.Now()
 }
 
-func (l *lastUsage) Touch() (releaseFunc func()) {
+func (l *lastUsage) Start() (stop func()) {
 	l.locks.Add(1)
 
 	return sync.OnceFunc(func() {

diff --git a/internal/conn/last_usage_test.go b/internal/conn/last_usage_test.go
@@ -18,7 +18,7 @@ func Test_lastUsage_Lock(t *testing.T) {
 		lu.t.Store(&start)
 		t1 := lu.Get()
 		require.Equal(t, start, t1)
-		f := lu.Touch()
+		f := lu.Start()
 		clock.Advance(time.Hour)
 		t2 := lu.Get()
 		require.Equal(t, start.Add(time.Hour), t2)
@@ -39,14 +39,14 @@ func Test_lastUsage_Lock(t *testing.T) {
 		lu.t.Store(&start)
 		t1 := lu.Get()
 		require.Equal(t, start, t1)
-		f1 := lu.Touch()
+		f1 := lu.Start()
 		clock.Advance(time.Hour)
 		t2 := lu.Get()
 		require.Equal(t, start.Add(time.Hour), t2)
-		f2 := lu.Touch()
+		f2 := lu.Start()
 		clock.Advance(time.Hour)
 		f1()
-		f3 := lu.Touch()
+		f3 := lu.Start()
 		clock.Advance(time.Hour)
 		t3 := lu.Get()
 		require.Equal(t, start.Add(3*time.Hour), t3)
@@ -83,7 +83,7 @@ func Test_lastUsage_Lock(t *testing.T) {
 			t2 := lu.Get()
 			require.Equal(t, start, t2)
 			clock.Advance(time.Hour)
-			defer lu.Touch()()
+			defer lu.Start()()
 			t3 := lu.Get()
 			require.Equal(t, start.Add(2*time.Hour), t3)
 			clock.Advance(time.Hour)