Return-Path: X-Original-To: apmail-hive-commits-archive@www.apache.org Delivered-To: apmail-hive-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 43AFD11889 for ; Wed, 13 Aug 2014 18:18:14 +0000 (UTC) Received: (qmail 81195 invoked by uid 500); 13 Aug 2014 18:18:14 -0000 Delivered-To: apmail-hive-commits-archive@hive.apache.org Received: (qmail 81158 invoked by uid 500); 13 Aug 2014 18:18:14 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 81147 invoked by uid 99); 13 Aug 2014 18:18:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Aug 2014 18:18:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Aug 2014 18:17:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8820E23888FE; Wed, 13 Aug 2014 18:17:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1617788 - in /hive/trunk: itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java Date: Wed, 13 Aug 2014 18:17:50 -0000 To: commits@hive.apache.org From: szehon@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140813181750.8820E23888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: szehon Date: Wed Aug 13 18:17:50 2014 New Revision: 1617788 URL: http://svn.apache.org/r1617788 Log: HIVE-7684 : Avoid validating hook EnforceReadOnlyTable during test driver cleanup. (Venki Korukanti via Szehon) Modified: hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java Modified: hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java URL: http://svn.apache.org/viewvc/hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1617788&r1=1617787&r2=1617788&view=diff ============================================================================== --- hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java (original) +++ hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java Wed Aug 13 18:17:50 2014 @@ -617,6 +617,9 @@ public class QTestUtil { if(!isSessionStateStarted) { startSessionState(); } + + SessionState.get().getConf().setBoolean("hive.test.shutdown.phase", true); + String cleanupCommands = readEntireFileIntoString(new File(cleanupScript)); LOG.info("Cleanup (" + cleanupScript + "):\n" + cleanupCommands); if(cliDriver == null) { @@ -624,6 +627,8 @@ public class QTestUtil { } cliDriver.processLine(cleanupCommands); + SessionState.get().getConf().setBoolean("hive.test.shutdown.phase", false); + // delete any contents in the warehouse dir Path p = new Path(testWarehouse); FileSystem fs = p.getFileSystem(conf); Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java?rev=1617788&r1=1617787&r2=1617788&view=diff ============================================================================== --- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java (original) +++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/hooks/EnforceReadOnlyTables.java Wed Aug 13 18:17:50 2014 @@ -59,7 +59,10 @@ public class EnforceReadOnlyTables imple public void run(SessionState sess, Set inputs, Set outputs, UserGroupInformation ugi) throws Exception { - if (sess.getConf().getBoolean("hive.test.init.phase", false) == true) { + + // Don't enforce during test driver setup or shutdown. + if (sess.getConf().getBoolean("hive.test.init.phase", false) || + sess.getConf().getBoolean("hive.test.shutdown.phase", false)) { return; } for (WriteEntity w: outputs) {