add retry for rest client

Author: shujiewu

spark-connector/common/src/main/java/org/apache/spark/sql/odps/OdpsClient.java

@@ -81,7 +81,11 @@ public class OdpsClient {
     private final static String META_LOOKUP_NAME = "META_LOOKUP_NAME";
     private final static String REFRESH_INTERVAL_SECONDS = "odps.cupid.bearer.token.refresh.interval.seconds";
     private final static String ODPS_BEARER_TOKEN_ENABLE = "odps.cupid.bearer.token.enable";
-    private static final int DEFAULT_TIMEOUT_IN_SECONDS = 300;
+
+    private final static String ODPS_TUNNEL_READ_TIMEOUT = "odps.tunnel.read.timeout.seconds";
+    private final static String ODPS_TUNNEL_CONNECT_TIMEOUT = "odps.tunnel.connect.timeout.seconds";
+    private final static String ODPS_TUNNEL_MAX_RETRIES = "odps.tunnel.max.retries";
+    private final static String ODPS_TUNNEL_RETRY_WAIT_TIME = "odps.tunnel.retry.wait.seconds";
 
     public static Builder builder() {
         return new Builder();
@@ -165,7 +169,10 @@ public EnvironmentSettings getEnvironmentSettings() {
                 .withAppStsAccount(odps.getAppStsAccount())
                 .build();
         RestOptions restOptions = RestOptions.newBuilder()
-                .withReadTimeout(DEFAULT_TIMEOUT_IN_SECONDS)
+                .withReadTimeout(Integer.parseInt(getSettings(ODPS_TUNNEL_READ_TIMEOUT).orElse("300")))
+                .withConnectTimeout(Integer.parseInt(getSettings(ODPS_TUNNEL_CONNECT_TIMEOUT).orElse("20")))
+                .withRetryTimes(Integer.parseInt(getSettings(ODPS_TUNNEL_MAX_RETRIES).orElse("5")))
+                .withRetryWaitTimeInSeconds(Integer.parseInt(getSettings(ODPS_TUNNEL_RETRY_WAIT_TIME).orElse("5")))
                 .build();
         EnvironmentSettings.Builder env = EnvironmentSettings.newBuilder()
                 .withDefaultProject(odps.getDefaultProject())

spark-connector/pom.xml

@@ -21,8 +21,8 @@
     <packaging>pom</packaging>
     <properties>
         <arrow.version>4.0.0</arrow.version>
-        <odps.sdk.version>0.50.4-public</odps.sdk.version>
-        <odps.sdk.table.version>0.50.4-public</odps.sdk.table.version>
+        <odps.sdk.version>0.50.5-public</odps.sdk.version>
+        <odps.sdk.table.version>0.50.5-public</odps.sdk.table.version>
         <spark.version>3.3.1</spark.version>
         <scala.version>2.12.10</scala.version>
         <scala.binary.version>2.12</scala.binary.version>