diff options
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/command/imports.go | 5 | ||||
| -rw-r--r-- | weed/filer/configuration.go | 1 | ||||
| -rw-r--r-- | weed/filer/tikv/tikv_store_kv.go | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/weed/command/imports.go b/weed/command/imports.go index ee35ed56f..2d522c334 100644 --- a/weed/command/imports.go +++ b/weed/command/imports.go @@ -3,9 +3,9 @@ package command import ( _ "net/http/pprof" - _ "github.com/chrislusf/seaweedfs/weed/remote_storage/s3" - _ "github.com/chrislusf/seaweedfs/weed/remote_storage/gcs" _ "github.com/chrislusf/seaweedfs/weed/remote_storage/azure" + _ "github.com/chrislusf/seaweedfs/weed/remote_storage/gcs" + _ "github.com/chrislusf/seaweedfs/weed/remote_storage/s3" _ "github.com/chrislusf/seaweedfs/weed/replication/sink/azuresink" _ "github.com/chrislusf/seaweedfs/weed/replication/sink/b2sink" @@ -29,4 +29,5 @@ import ( _ "github.com/chrislusf/seaweedfs/weed/filer/redis" _ "github.com/chrislusf/seaweedfs/weed/filer/redis2" _ "github.com/chrislusf/seaweedfs/weed/filer/sqlite" + _ "github.com/chrislusf/seaweedfs/weed/filer/tikv" ) diff --git a/weed/filer/configuration.go b/weed/filer/configuration.go index 9ef2f3e0f..da75b575b 100644 --- a/weed/filer/configuration.go +++ b/weed/filer/configuration.go @@ -82,6 +82,7 @@ func (f *Filer) LoadConfiguration(config *util.ViperProxy) { func validateOneEnabledStore(config *util.ViperProxy) { enabledStore := "" for _, store := range Stores { + glog.V(0).Infof("Store Engines: %v", store.GetName()) if config.GetBool(store.GetName() + ".enabled") { if enabledStore == "" { enabledStore = store.GetName() diff --git a/weed/filer/tikv/tikv_store_kv.go b/weed/filer/tikv/tikv_store_kv.go index 2472759c0..dcc9acf8c 100644 --- a/weed/filer/tikv/tikv_store_kv.go +++ b/weed/filer/tikv/tikv_store_kv.go @@ -30,6 +30,9 @@ func (store *TikvStore) KvGet(ctx context.Context, key []byte) ([]byte, error) { } return err }) + if isNotExists(err) { + return data, filer.ErrKvNotFound + } return data, err } |