Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 B1A111065D for ; Wed, 13 Nov 2013 18:08:37 +0000 (UTC) Received: (qmail 88067 invoked by uid 500); 13 Nov 2013 18:08:37 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 87938 invoked by uid 500); 13 Nov 2013 18:08:34 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 87931 invoked by uid 99); 13 Nov 2013 18:08:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Nov 2013 18:08:33 +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 Nov 2013 18:08:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 69AD1238883D; Wed, 13 Nov 2013 18:08:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1541642 - in /hbase/branches/0.94/src: main/java/org/apache/hadoop/hbase/rest/SchemaResource.java test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java Date: Wed, 13 Nov 2013 18:08:09 -0000 To: commits@hbase.apache.org From: larsh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131113180809.69AD1238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: larsh Date: Wed Nov 13 18:08:08 2013 New Revision: 1541642 URL: http://svn.apache.org/r1541642 Log: HBASE-9849 [REST] Forbidden schema delete in read only mode (Julian Zhou) Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java?rev=1541642&r1=1541641&r2=1541642&view=diff ============================================================================== --- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java (original) +++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/rest/SchemaResource.java Wed Nov 13 18:08:08 2013 @@ -238,6 +238,11 @@ public class SchemaResource extends Reso LOG.debug("DELETE " + uriInfo.getAbsolutePath()); } servlet.getMetrics().incrementRequests(1); + if (servlet.isReadOnly()) { + return Response.status(Response.Status.FORBIDDEN).type(MIMETYPE_TEXT) + .entity("Forbidden" + CRLF).build(); + } + try { HBaseAdmin admin = servlet.getAdmin(); boolean success = false; Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java?rev=1541642&r1=1541641&r2=1541642&view=diff ============================================================================== --- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java (original) +++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java Wed Nov 13 18:08:08 2013 @@ -115,14 +115,17 @@ public class TestSchemaResource { model = fromXML(response.getBody()); TestTableSchemaModel.checkModel(model, TABLE1); - // delete the table - client.delete(schemaPath); - - // make sure HBase concurs - assertFalse(admin.tableExists(TABLE1)); + // test delete schema operation is forbidden in read-only mode + response = client.delete(schemaPath); + assertEquals(response.getCode(), 403); // return read-only setting back to default conf.set("hbase.rest.readonly", "false"); + + // delete the table and make sure HBase concurs + response = client.delete(schemaPath); + assertEquals(response.getCode(), 200); + assertFalse(admin.tableExists(TABLE1)); } @Test @@ -163,14 +166,17 @@ public class TestSchemaResource { model.getObjectFromMessage(response.getBody()); TestTableSchemaModel.checkModel(model, TABLE2); - // delete the table - client.delete(schemaPath); - - // make sure HBase concurs - assertFalse(admin.tableExists(TABLE2)); + // test delete schema operation is forbidden in read-only mode + response = client.delete(schemaPath); + assertEquals(response.getCode(), 403); // return read-only setting back to default conf.set("hbase.rest.readonly", "false"); + + // delete the table and make sure HBase concurs + response = client.delete(schemaPath); + assertEquals(response.getCode(), 200); + assertFalse(admin.tableExists(TABLE2)); } @org.junit.Rule