Repository: sentry Updated Branches: refs/heads/sentry-ha-redesign 0bf0a9990 -> 3d8877906
SENTRY-1526: Sentry processed stays alive after being killed (Fixing Mismerge) (Alexander Kolbasov via Vamsee Yarlagadda) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/3d887790 Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/3d887790 Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/3d887790 Branch: refs/heads/sentry-ha-redesign Commit: 3d88779068ff20a31f842e70caa624a47fd1e34b Parents: 0bf0a99 Author: Vamsee Yarlagadda <[email protected]> Authored: Fri Dec 16 12:39:45 2016 -0800 Committer: Vamsee Yarlagadda <[email protected]> Committed: Fri Dec 16 12:39:45 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/sentry/service/thrift/SentryService.java | 6 ------ 1 file changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/3d887790/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/SentryService.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/SentryService.java b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/SentryService.java index 5e36e48..a9d49f8 100644 --- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/SentryService.java +++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/SentryService.java @@ -349,12 +349,6 @@ public class SentryService implements Callable { } } - // wait for the service thread to finish execution - public synchronized void waitOnFuture() throws ExecutionException, InterruptedException { - LOGGER.info("Waiting on future.get()"); - serviceStatus.get(); - } - private MultiException addMultiException(MultiException exception, Exception e) { MultiException newException = exception; if (newException == null) {
