sql: report internal distsql communication error as an internal error

related to cockroachdb#31645 Release note: None
vivekmenezes · Oct 23, 2018 · f6c1397 · f6c1397
1 parent 9b28709
commit f6c1397
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/pkg/sql/distsqlrun/inbound.go b/pkg/sql/distsqlrun/inbound.go
@@ -96,7 +96,7 @@ func processInboundStreamHelper(
 			if err != nil {
 				if err != io.EOF {
 					// Communication error.
-					err = pgerror.NewErrorf(pgerror.CodeConnectionFailureError, "communication error: %s", err)
+					err = pgerror.NewErrorf(pgerror.CodeInternalError, "communication error: %s", err)
 					sendErrToConsumer(err)
 					errChan <- err
 					return

diff --git a/pkg/sql/schema_changer.go b/pkg/sql/schema_changer.go
@@ -187,14 +187,11 @@ func isPermanentSchemaChangeError(err error) bool {
 		return false
 	case *pgerror.Error:
 		switch err.Code {
-		case pgerror.CodeSerializationFailureError, pgerror.CodeConnectionFailureError:
+		case pgerror.CodeSerializationFailureError:
 			return false
 
 		case pgerror.CodeInternalError:
-			if err.Message == context.DeadlineExceeded.Error() {
-				return false
-			}
-
+			return false
 		}
 	}