Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: handle specific exceptions #1370

Merged
merged 13 commits into from Jun 15, 2021
Merged
@@ -0,0 +1,36 @@
/*
* Copyright 2015 Google LLC
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Copyright 2015 Google LLC
* Copyright 2021 Google LLC

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

*
* 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.ExceptionHandler;
import com.google.cloud.ServiceOptions;
import com.google.cloud.BaseService;


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();
}
Expand Up @@ -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;
Expand Down Expand Up @@ -370,7 +369,7 @@ public com.google.api.services.bigquery.model.Job call() {
}
},
getOptions().getRetrySettings(),
EXCEPTION_HANDLER,
EXCEPTION_HANDLER,
getOptions().getClock()));
} catch (RetryHelper.RetryHelperException e) {
throw BigQueryException.translateAndThrow(e);
Expand Down Expand Up @@ -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<>(
Expand Down Expand Up @@ -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);
Expand Down