fix: cloudproviderregion sync ignore panic

This commit is contained in:
Qiu Jian
2020-04-17 21:59:43 +08:00
parent 729f8f175f
commit 242d59d7f5
4 changed files with 84 additions and 4 deletions
+7 -4
View File
@@ -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
}
+15
View File
@@ -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"
+31
View File
@@ -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()
}
+31
View File
@@ -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")
}