Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 104B6200C76 for ; Sat, 29 Apr 2017 01:13:31 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0EDAB160BA3; Fri, 28 Apr 2017 23:13:31 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 57D4A160BB8 for ; Sat, 29 Apr 2017 01:13:30 +0200 (CEST) Received: (qmail 73816 invoked by uid 500); 28 Apr 2017 23:13:29 -0000 Mailing-List: contact commits-help@sentry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sentry.apache.org Delivered-To: mailing list commits@sentry.apache.org Received: (qmail 73807 invoked by uid 99); 28 Apr 2017 23:13:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Apr 2017 23:13:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6B8BDE02B4; Fri, 28 Apr 2017 23:13:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akolb@apache.org To: commits@sentry.apache.org Message-Id: <9b01822a4b5047e5afc1ac922ec514d6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: sentry git commit: SENTRY-1718: TestSentryStore often fails in setup() (Na Li, reviewed by: Alex Kolbasov) Date: Fri, 28 Apr 2017 23:13:29 +0000 (UTC) archived-at: Fri, 28 Apr 2017 23:13:31 -0000 Repository: sentry Updated Branches: refs/heads/sentry-ha-redesign 14b3b904a -> 3722abec4 SENTRY-1718: TestSentryStore often fails in setup() (Na Li, reviewed by: Alex Kolbasov) Project: http://git-wip-us.apache.org/repos/asf/sentry/repo Commit: http://git-wip-us.apache.org/repos/asf/sentry/commit/3722abec Tree: http://git-wip-us.apache.org/repos/asf/sentry/tree/3722abec Diff: http://git-wip-us.apache.org/repos/asf/sentry/diff/3722abec Branch: refs/heads/sentry-ha-redesign Commit: 3722abec4ea077566c46b8221f3b050d2e0dbf86 Parents: 14b3b90 Author: Alexander Kolbasov Authored: Fri Apr 28 16:12:58 2017 -0700 Committer: Alexander Kolbasov Committed: Fri Apr 28 16:12:58 2017 -0700 ---------------------------------------------------------------------- .../db/service/persistent/TestSentryStore.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sentry/blob/3722abec/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java ---------------------------------------------------------------------- diff --git a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java index acf8732..e7443eb 100644 --- a/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java +++ b/sentry-provider/sentry-provider-db/src/test/java/org/apache/sentry/provider/db/service/persistent/TestSentryStore.java @@ -93,10 +93,18 @@ public class TestSentryStore extends org.junit.Assert { conf = new Configuration(false); final String ourUrl = UserProvider.SCHEME_NAME + ":///"; conf.set(CredentialProviderFactory.CREDENTIAL_PROVIDER_PATH, ourUrl); + + // THis should be a UserGroupInformation provider CredentialProvider provider = CredentialProviderFactory.getProviders(conf).get(0); - provider.createCredentialEntry(ServerConfig. - SENTRY_STORE_JDBC_PASS, passwd); - provider.flush(); + + + // The user credentials are stored as a static variable by UserGrouoInformation provider. + // We need to only set the password the first time, an attempt to set it for the second + // time fails with an exception. + if(provider.getCredentialEntry(ServerConfig.SENTRY_STORE_JDBC_PASS) == null) { + provider.createCredentialEntry(ServerConfig.SENTRY_STORE_JDBC_PASS, passwd); + provider.flush(); + } dataDir = new File(Files.createTempDir(), "sentry_policy_db"); conf.set(ServerConfig.SENTRY_VERIFY_SCHEM_VERSION, "false");