Merge branch 'v2.3.1_qc_fix_contract' into 'v2.3.1_qc' (merge request !189)

fix: Random contract err --bug=1004836 fix: Random contract err --bug=1004836

Merge branch 'v2.3.1_qc_fix_contract' into 'v2.3.1_qc' (merge request !189)
fix: Random contract err --bug=1004836 fix: Random contract err --bug=1004836
6c000247 · tianle · e5031f52 · 33230823 · 6c000247
Commit 6c000247 authored Dec 26, 2022 by tianle
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

contractmgr/contract_manager.go contractmgr/contract_manager.go +9 -0

No files found.
--- a/contractmgr/contract_manager.go
+++ b/contractmgr/contract_manager.go
@@ -1185,6 +1185,9 @@ func (r *ContractManagerRuntime) checkGoContractVersion(contract *commonPb.Contr
 	unzipCommand := fmt.Sprintf("7z e %s -o%s -y", contractZipPath, tmpContractDir) // contract1
 	err = runCmd(unzipCommand)
 	if err != nil {
+		if strings.Contains(err.Error(), tmpContractDir) {
+			return nil, fmt.Errorf("failed to extract contract")
+		}
 		return nil, fmt.Errorf("failed to extract contract, %v", err)
 	}

@@ -1200,6 +1203,9 @@ func (r *ContractManagerRuntime) checkGoContractVersion(contract *commonPb.Contr
 	fileInfoList, err := ioutil.ReadDir(tmpContractDir)
 	if err != nil {
 		r.log.Errorf("failed to read tmp contract dir %s, %v", tmpContractDir, err)
+		if strings.Contains(err.Error(), tmpContractDir) {
+			return nil, fmt.Errorf("failed to read tmp contract dir")
+		}
 		return nil, fmt.Errorf("failed to read tmp contract dir, %v", err)
 	}

@@ -1223,6 +1229,9 @@ func (r *ContractManagerRuntime) checkGoContractVersion(contract *commonPb.Contr
 		extBytecode, err = ioutil.ReadFile(fp)
 		if err != nil {
 			r.log.Errorf("read from byteCode file %s failed, %s", fp, err)
+			if strings.Contains(err.Error(), tmpContractDir) {
+				return nil, fmt.Errorf("read from byteCode file failed")
+			}
 			return nil, fmt.Errorf("read from byteCode file failed, %s", err)
 		}