feat: change the error handler when the key does not exist in etcd

Author: mayooot

internal/etcd/common.go

@@ -7,6 +7,8 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+
+	"github.com/mayooot/gpu-docker-api/internal/xerrors"
 )
 
 const (
@@ -57,11 +59,10 @@ func Get(resource EtcdResource, key string) (bytes []byte, err error) {
 	if err != nil {
 		return bytes, errors.Wrapf(err, "etcd.Get failed, key: %s", key)
 	}
-
-	if len(resp.Kvs) != 0 {
-		bytes = resp.Kvs[0].Value
+	if len(resp.Kvs) == 0 {
+		return bytes, errors.Wrapf(xerrors.NewNotExistInEtcdError(), "etcd.Get failed, key: %s", key)
 	}
-	return bytes, err
+	return resp.Kvs[0].Value, err
 }
 
 func Del(resource EtcdResource, key string) error {

internal/scheduler/gpuscheduler/scheduler.go

@@ -123,7 +123,11 @@ func (s *scheduler) serialize() *string {
 func initFormEtcd() (s *scheduler, err error) {
 	bytes, err := etcd.Get(etcd.Gpus, gpuStatusMapKey)
 	if err != nil {
-		return s, err
+		if xerrors.IsNotExistInEtcdError(err) {
+			err = nil
+		} else {
+			return s, err
+		}
 	}
 
 	s = &scheduler{

internal/scheduler/portscheduler/scheduler.go

@@ -124,12 +124,11 @@ func (s *scheduler) RestorePorts(ports []int) {
 	}
 }
 
-// GetUsedPortSet 获取 GPU 使用信息
-func (s *scheduler) GetUsedPortSet() map[int]struct{} {
+// GetPortStatus 获取 Port 使用情况
+func (s *scheduler) GetPortStatus() *scheduler {
 	s.RLock()
 	defer s.RUnlock()
-
-	return s.UsedPortSet
+	return s
 }
 
 func (s *scheduler) serialize() *string {
@@ -144,7 +143,11 @@ func (s *scheduler) serialize() *string {
 func initFormEtcd() (s *scheduler, err error) {
 	bytes, err := etcd.Get(etcd.Ports, usedPortSetKey)
 	if err != nil {
-		return s, err
+		if xerrors.IsNotExistInEtcdError(err) {
+			err = nil
+		} else {
+			return s, err
+		}
 	}
 
 	var alias alias

internal/version/version.go

@@ -7,6 +7,7 @@ import (
 	"github.com/siddontang/go/sync2"
 
 	"github.com/mayooot/gpu-docker-api/internal/etcd"
+	"github.com/mayooot/gpu-docker-api/internal/xerrors"
 )
 
 var (
@@ -64,7 +65,11 @@ func Close() error {
 func initVersionMap(key string) (vm *versionMap, err error) {
 	bytes, err := etcd.Get(etcd.Versions, key)
 	if err != nil {
-		return vm, err
+		if xerrors.IsNotExistInEtcdError(err) {
+			err = nil
+		} else {
+			return vm, err
+		}
 	}
 
 	vm = newVersionMap()

internal/xerrors/etcd.go

@@ -0,0 +1,20 @@
+package xerrors
+
+import (
+	"github.com/pkg/errors"
+)
+
+const (
+	notExistInEtcd = "not exist in etcd"
+)
+
+func NewNotExistInEtcdError() error {
+	return errors.New(notExistInEtcd)
+}
+
+func IsNotExistInEtcdError(err error) bool {
+	if err == nil {
+		return false
+	}
+	return errors.Cause(err).Error() == notExistInEtcd
+}