Skip to content

Commit d896157

Browse files
Fix errcheck in ./common/persistence/ (#3743)
1 parent 11b808a commit d896157

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

common/persistence/dataInterfaces.go

+1
Original file line numberDiff line numberDiff line change
@@ -1044,6 +1044,7 @@ type (
10441044
}
10451045

10461046
// Closeable is an interface for any entity that supports a close operation to release resources
1047+
// TODO: allow this method to return errors
10471048
Closeable interface {
10481049
Close()
10491050
}

common/persistence/sql/common.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ func (m *SqlStore) GetName() string {
5959

6060
func (m *SqlStore) Close() {
6161
if m.Db != nil {
62-
m.Db.Close()
62+
err := m.Db.Close()
63+
if err != nil {
64+
m.logger.Error("Error closing SQL database", tag.Error(err))
65+
}
6366
}
6467
}
6568

common/persistence/tests/sqlite_test.go

+16-5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"path"
3131
"testing"
3232

33+
"github.com/stretchr/testify/assert"
3334
"github.com/stretchr/testify/suite"
3435

3536
"go.temporal.io/server/common/config"
@@ -179,7 +180,9 @@ func TestSQLiteTaskQueueTaskSuite(t *testing.T) {
179180
func TestSQLiteFileExecutionMutableStateStoreSuite(t *testing.T) {
180181
cfg := NewSQLiteFileConfig()
181182
SetupSQLiteDatabase(cfg)
182-
defer os.Remove(cfg.DatabaseName)
183+
defer func() {
184+
assert.NoError(t, os.Remove(cfg.DatabaseName))
185+
}()
183186
logger := log.NewNoopLogger()
184187
factory := sql.NewFactory(
185188
*cfg,
@@ -212,7 +215,9 @@ func TestSQLiteFileExecutionMutableStateStoreSuite(t *testing.T) {
212215
func TestSQLiteFileExecutionMutableStateTaskStoreSuite(t *testing.T) {
213216
cfg := NewSQLiteFileConfig()
214217
SetupSQLiteDatabase(cfg)
215-
defer os.Remove(cfg.DatabaseName)
218+
defer func() {
219+
assert.NoError(t, os.Remove(cfg.DatabaseName))
220+
}()
216221
logger := log.NewNoopLogger()
217222
factory := sql.NewFactory(
218223
*cfg,
@@ -245,7 +250,9 @@ func TestSQLiteFileExecutionMutableStateTaskStoreSuite(t *testing.T) {
245250
func TestSQLiteFileHistoryStoreSuite(t *testing.T) {
246251
cfg := NewSQLiteFileConfig()
247252
SetupSQLiteDatabase(cfg)
248-
defer os.Remove(cfg.DatabaseName)
253+
defer func() {
254+
assert.NoError(t, os.Remove(cfg.DatabaseName))
255+
}()
249256
logger := log.NewNoopLogger()
250257
factory := sql.NewFactory(
251258
*cfg,
@@ -268,7 +275,9 @@ func TestSQLiteFileHistoryStoreSuite(t *testing.T) {
268275
func TestSQLiteFileTaskQueueSuite(t *testing.T) {
269276
cfg := NewSQLiteFileConfig()
270277
SetupSQLiteDatabase(cfg)
271-
defer os.Remove(cfg.DatabaseName)
278+
defer func() {
279+
assert.NoError(t, os.Remove(cfg.DatabaseName))
280+
}()
272281
logger := log.NewNoopLogger()
273282
factory := sql.NewFactory(
274283
*cfg,
@@ -291,7 +300,9 @@ func TestSQLiteFileTaskQueueSuite(t *testing.T) {
291300
func TestSQLiteFileTaskQueueTaskSuite(t *testing.T) {
292301
cfg := NewSQLiteFileConfig()
293302
SetupSQLiteDatabase(cfg)
294-
defer os.Remove(cfg.DatabaseName)
303+
defer func() {
304+
assert.NoError(t, os.Remove(cfg.DatabaseName))
305+
}()
295306
logger := log.NewNoopLogger()
296307
factory := sql.NewFactory(
297308
*cfg,

0 commit comments

Comments
 (0)