restores highly available service #6153
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 | ||
| * | ||
| * https://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 org.apache.accumulo.server; | ||
|
|
||
| /** | ||
| * This interface allows service implementations which support running multiple instances | ||
| * concurrently with only one active instance to report whether or not they are the active service. | ||
| */ | ||
| public interface HighlyAvailableService { | ||
|
|
||
| /** | ||
| * Is this service instance currently the active instance for the Accumulo cluster. | ||
| * | ||
| * @return True if the service is the active service, false otherwise. | ||
| */ | ||
| boolean isActiveService(); | ||
|
|
||
| /** | ||
| * Is this service instance currently in the process of upgrading. | ||
| * | ||
| * @return True if the service is upgrading, false otherwise. | ||
| */ | ||
| default boolean isUpgrading() { | ||
| return false; | ||
| } | ||
|
|
||
| /** | ||
| * Get the name of the service | ||
| * | ||
| * @return service name | ||
| */ | ||
| default String getServiceName() { | ||
| return this.getClass().getSimpleName(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 | ||
| * | ||
| * https://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 org.apache.accumulo.server.rpc; | ||
|
|
||
| import java.lang.reflect.InvocationHandler; | ||
| import java.lang.reflect.InvocationTargetException; | ||
| import java.lang.reflect.Method; | ||
| import java.util.Arrays; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
|
|
||
| import org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException; | ||
| import org.apache.accumulo.server.HighlyAvailableService; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * An {@link InvocationHandler} which checks to see if a {@link HighlyAvailableService} is the | ||
| * current active instance of that service, throwing {@link ThriftNotActiveServiceException} when it | ||
| * is not the current active instance. | ||
| */ | ||
| public class HighlyAvailableServiceInvocationHandler<I> implements InvocationHandler { | ||
| private static final Logger LOG = | ||
| LoggerFactory.getLogger(HighlyAvailableServiceInvocationHandler.class); | ||
|
|
||
| private final I instance; | ||
| private final HighlyAvailableService service; | ||
| private final Set<String> onewayMethods; | ||
|
|
||
| public HighlyAvailableServiceInvocationHandler(I instance, HighlyAvailableService service, | ||
| Set<String> onewayMethods) { | ||
| this.instance = Objects.requireNonNull(instance); | ||
| this.service = Objects.requireNonNull(service); | ||
| this.onewayMethods = onewayMethods; | ||
| } | ||
|
|
||
| @Override | ||
| public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { | ||
|
|
||
| // If the service is upgrading, throw an exception | ||
| if (service.isUpgrading()) { | ||
| if (onewayMethods.contains(method.getName())) { | ||
| // if thrift one way method throws an exception it will just log an error | ||
| LOG.debug("Ignoring one way thrift call during upgrade : {} {}", method.getName(), | ||
| Arrays.asList(args)); | ||
| return null; | ||
| } else { | ||
| LOG.trace("Service can not be accessed while it is upgrading."); | ||
| throw new ThriftNotActiveServiceException(service.getServiceName(), | ||
| "Service can not be accessed while it is upgrading"); | ||
| } | ||
| } | ||
|
|
||
| // If the service is not active, throw an exception | ||
| if (!service.isActiveService()) { | ||
| if (onewayMethods.contains(method.getName())) { | ||
| // if thrift one way method throws an exception it will just log an error | ||
| LOG.debug("Ignoring one way thrift call because not active : {} {}", method.getName(), | ||
| Arrays.asList(args)); | ||
|
Contributor
There was a problem hiding this comment. I think you need to return on this line, or it will fall through and invoke the method. |
||
| return null; | ||
| } else { | ||
| LOG.trace("Denying access to RPC service as this instance is not the active instance."); | ||
| throw new ThriftNotActiveServiceException(service.getServiceName(), | ||
| "Denying access to RPC service as this instance is not the active instance"); | ||
| } | ||
| } | ||
| try { | ||
| // Otherwise, call the real method | ||
| return method.invoke(instance, args); | ||
| } catch (InvocationTargetException ex) { | ||
| throw ex.getCause(); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you need to return on this line, or it will fall through and invoke the method.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, that would have spammed the logs w/ errors. Fixed in d5670e6