Skip to content
Permalink
Browse files
fix: handle specific exceptions (#1370)
* Extending BaseService to create BIGQUERY_EXCEPTION_HANDLER with retry

* Replacing EXCEPTION_HANDLER with BIGQUERY_EXCEPTION_HANDLER with retry logic

* Adding retryOn java.net.UnknownHostException

* Adding License Information

* Reverting to EXCEPTION_HANDLER for create method, using BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER for listDataset

* Using BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER for query method

* Reverting back to EXCEPTION_HANDLER for create method

* Updating to "Copyright 2021"

* Fixed formatting

* Fixed formatting
  • Loading branch information
prash-mi committed Jun 15, 2021
1 parent dab6e48 commit 68808e9f47c07af598324f3f07dd996bc1e5297b
@@ -0,0 +1,36 @@
/*
* Copyright 2021 Google LLC
*
* 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 com.google.cloud.bigquery;

import com.google.cloud.BaseService;
import com.google.cloud.ExceptionHandler;
import com.google.cloud.ServiceOptions;

abstract class BigQueryBaseService<OptionsT extends ServiceOptions<?, OptionsT>>
extends BaseService {

protected BigQueryBaseService(ServiceOptions options) {
super(options);
}

public static final ExceptionHandler BIGQUERY_EXCEPTION_HANDLER =
ExceptionHandler.newBuilder()
.abortOn(RuntimeException.class)
.retryOn(java.net.ConnectException.class) // retry on Connection Exception
.retryOn(java.net.UnknownHostException.class) // retry on UnknownHostException
.addInterceptors(EXCEPTION_HANDLER_INTERCEPTOR)
.build();
}
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.google.cloud.bigquery;

import static com.google.cloud.RetryHelper.runWithRetries;
@@ -458,7 +457,7 @@ private static Page<Dataset> listDatasets(
}
},
serviceOptions.getRetrySettings(),
EXCEPTION_HANDLER,
BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,
serviceOptions.getClock());
String cursor = result.x();
return new PageImpl<>(
@@ -1256,7 +1255,7 @@ public com.google.api.services.bigquery.model.QueryResponse call() {
}
},
getOptions().getRetrySettings(),
EXCEPTION_HANDLER,
BigQueryBaseService.BIGQUERY_EXCEPTION_HANDLER,
getOptions().getClock());
} catch (RetryHelperException e) {
throw BigQueryException.translateAndThrow(e);

0 comments on commit 68808e9

Please sign in to comment.