ignore common etcd endpoint not found error

yunionio · Jun 21, 2020 · e9da102 · e9da102
1 parent 183180e
commit e9da102
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/pkg/compute/service/service.go b/pkg/compute/service/service.go
@@ -43,6 +43,7 @@ import (
 	_ "yunion.io/x/onecloud/pkg/compute/storagedrivers"
 	_ "yunion.io/x/onecloud/pkg/compute/tasks"
 	"yunion.io/x/onecloud/pkg/controller/autoscaling"
+	"yunion.io/x/onecloud/pkg/httperrors"
 	_ "yunion.io/x/onecloud/pkg/multicloud/loader"
 )
 
@@ -180,6 +181,9 @@ func initDefaultEtcdClient(opts *common_options.DBOptions) error {
 func initEtcdLockOpts(opts *options.ComputeOptions) error {
 	etcdEndpoint, err := app_common.FetchEtcdServiceInfo()
 	if err != nil {
+		if errors.Cause(err) == httperrors.ErrNotFound {
+			return nil
+		}
 		return errors.Wrap(err, "fetch etcd service info")
 	}
 	if etcdEndpoint != nil {

diff --git a/pkg/hostman/host_services.go b/pkg/hostman/host_services.go
@@ -43,6 +43,7 @@ import (
 	"yunion.io/x/onecloud/pkg/hostman/storageman/diskhandlers"
 	"yunion.io/x/onecloud/pkg/hostman/storageman/storagehandler"
 	"yunion.io/x/onecloud/pkg/hostman/system_service"
+	"yunion.io/x/onecloud/pkg/httperrors"
 	"yunion.io/x/onecloud/pkg/util/procutils"
 	"yunion.io/x/onecloud/pkg/util/sysutils"
 )
@@ -170,6 +171,9 @@ func (host *SHostService) initHandlers(app *appsrv.Application) {
 func (host *SHostService) initEtcdConfig() error {
 	etcdEndpoint, err := app_common.FetchEtcdServiceInfo()
 	if err != nil {
+		if errors.Cause(err) == httperrors.ErrNotFound {
+			return nil
+		}
 		return errors.Wrap(err, "fetch etcd service info")
 	}
 	if etcdEndpoint == nil {