From 242d59d7f5dab64235e8bf242eb3d9d1cc68c7d0 Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Fri, 17 Apr 2020 21:59:43 +0800
Subject: [PATCH] fix: cloudproviderregion sync ignore panic

---
 pkg/compute/models/cloudproviderregions.go | 11 +++++---
 pkg/util/nopanic/doc.go                    | 15 +++++++++++
 pkg/util/nopanic/nopanic.go                | 31 ++++++++++++++++++++++
 pkg/util/nopanic/nopanic_test.go           | 31 ++++++++++++++++++++++
 4 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 pkg/util/nopanic/doc.go
 create mode 100644 pkg/util/nopanic/nopanic.go
 create mode 100644 pkg/util/nopanic/nopanic_test.go

diff --git a/pkg/compute/models/cloudproviderregions.go b/pkg/compute/models/cloudproviderregions.go
index f4585afb11..f049a23cd6 100644
--- a/pkg/compute/models/cloudproviderregions.go
+++ b/pkg/compute/models/cloudproviderregions.go
@@ -32,6 +32,7 @@ import (
 	"yunion.io/x/onecloud/pkg/cloudcommon/db"
 	"yunion.io/x/onecloud/pkg/httperrors"
 	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/pkg/util/nopanic"
 	"yunion.io/x/onecloud/pkg/util/stringutils2"
 )
 
@@ -418,10 +419,12 @@ func (self *SCloudproviderregion) getSyncTaskKey() string {
 func (self *SCloudproviderregion) submitSyncTask(userCred mcclient.TokenCredential, syncRange SSyncRange, waitChan chan bool) {
 	self.markStartSync(userCred)
 	RunSyncCloudproviderRegionTask(self.getSyncTaskKey(), func() {
-		err := self.DoSync(context.Background(), userCred, syncRange)
-		if err != nil {
-			log.Errorf("DoSync faild %v", err)
-		}
+		nopanic.Run(func() {
+			err := self.DoSync(context.Background(), userCred, syncRange)
+			if err != nil {
+				log.Errorf("DoSync faild %v", err)
+			}
+		})
 		if waitChan != nil {
 			waitChan <- true
 		}
diff --git a/pkg/util/nopanic/doc.go b/pkg/util/nopanic/doc.go
new file mode 100644
index 0000000000..c0d73756ea
--- /dev/null
+++ b/pkg/util/nopanic/doc.go
@@ -0,0 +1,15 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package nopanic // import "yunion.io/x/onecloud/pkg/util/nopanic"
diff --git a/pkg/util/nopanic/nopanic.go b/pkg/util/nopanic/nopanic.go
new file mode 100644
index 0000000000..2eded62877
--- /dev/null
+++ b/pkg/util/nopanic/nopanic.go
@@ -0,0 +1,31 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package nopanic
+
+import (
+	"runtime/debug"
+
+	"yunion.io/x/log"
+)
+
+func Run(f func()) {
+	defer func() {
+		if r := recover(); r != nil {
+			log.Errorf("Panic catched: %s", r)
+			debug.PrintStack()
+		}
+	}()
+	f()
+}
diff --git a/pkg/util/nopanic/nopanic_test.go b/pkg/util/nopanic/nopanic_test.go
new file mode 100644
index 0000000000..6b18ccf488
--- /dev/null
+++ b/pkg/util/nopanic/nopanic_test.go
@@ -0,0 +1,31 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package nopanic
+
+import (
+	"testing"
+)
+
+func TestRun(t *testing.T) {
+	defer func() {
+		if r := recover(); r != nil {
+			t.Fatalf("panic leaked!!!")
+		}
+	}()
+	Run(func() {
+		panic("panic!!!")
+	})
+	t.Logf("run complete")
+}