hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r1438204 - in /hbase/trunk/hbase-server/src: main/resources/hbase-webapps/static/js/jquery.min.js test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java
Date Thu, 24 Jan 2013 21:33:39 GMT
Author: enis
Date: Thu Jan 24 21:33:39 2013
New Revision: 1438204

URL: http://svn.apache.org/viewvc?rev=1438204&view=rev
Log:
HBASE-7656. Clean up line endings to be LF in the repo

Modified:
    hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js
    hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java

Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js?rev=1438204&r1=1438203&r2=1438204&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js Thu
Jan 24 21:33:39 2013
@@ -1,2 +1,2 @@
-/*! jQuery v1.8.3 jquery.com | jquery.org/license */
+/*! jQuery v1.8.3 jquery.com | jquery.org/license */

[... 3 lines stripped ...]
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java?rev=1438204&r1=1438203&r2=1438204&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java
(original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java
Thu Jan 24 21:33:39 2013
@@ -1,123 +1,123 @@
-/*
- * 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
- *
- *     http://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.hadoop.hbase.zookeeper;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.Properties;
-
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.Abortable;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.MediumTests;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooDefs.Ids;
-import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.data.Stat;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-@Category(MediumTests.class)
-public class TestRecoverableZooKeeper {
-
-  private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
-
-  Abortable abortable = new Abortable() {
-    @Override
-    public void abort(String why, Throwable e) {
-
-    }
-
-    @Override
-    public boolean isAborted() {
-      return false;
-    }
-  };
-
-  @BeforeClass
-  public static void setUpBeforeClass() throws Exception {
-    TEST_UTIL.startMiniZKCluster();
-  }
-
-  @AfterClass
-  public static void tearDownAfterClass() throws Exception {
-    TEST_UTIL.shutdownMiniZKCluster();
-  }
-
-  @Test
-  public void testSetDataVersionMismatchInLoop() throws Exception {
-    String znode = "/hbase/region-in-transition/9af7cfc9b15910a0b3d714bf40a3248f";
-    Configuration conf = TEST_UTIL.getConfiguration();
-    Properties properties = ZKConfig.makeZKProps(conf);
-    ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testSetDataVersionMismatchInLoop",
-        abortable, true);
-    String ensemble = ZKConfig.getZKQuorumServersString(properties);
-    RecoverableZooKeeper rzk = ZKUtil.connect(conf, ensemble, zkw);
-    rzk.create(znode, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-    rzk.setData(znode, "OPENING".getBytes(), 0);
-    Field zkField = RecoverableZooKeeper.class.getDeclaredField("zk");
-    zkField.setAccessible(true);
-    int timeout = conf.getInt(HConstants.ZK_SESSION_TIMEOUT, HConstants.DEFAULT_ZK_SESSION_TIMEOUT);
-    ZookeeperStub zkStub = new ZookeeperStub(ensemble, timeout, zkw);
-    zkStub.setThrowExceptionInNumOperations(1);
-    zkField.set(rzk, zkStub);
-    byte[] opened = "OPENED".getBytes();
-    rzk.setData(znode, opened, 1);
-    byte[] data = rzk.getData(znode, false, new Stat());
-    assertTrue(Bytes.equals(opened, data));
-  }
-
-  class ZookeeperStub extends ZooKeeper {
-
-    private int throwExceptionInNumOperations;
-
-    public ZookeeperStub(String connectString, int sessionTimeout, Watcher watcher)
-        throws IOException {
-      super(connectString, sessionTimeout, watcher);
-    }
-
-    public void setThrowExceptionInNumOperations(int throwExceptionInNumOperations) {
-      this.throwExceptionInNumOperations = throwExceptionInNumOperations;
-    }
-
-    private void checkThrowKeeperException() throws KeeperException {
-      if (throwExceptionInNumOperations == 1) {
-        throwExceptionInNumOperations = 0;
-        throw new KeeperException.ConnectionLossException();
-      }
-      if (throwExceptionInNumOperations > 0)
-        throwExceptionInNumOperations--;
-    }
-
-    @Override
-    public Stat setData(String path, byte[] data, int version) throws KeeperException,
-        InterruptedException {
-      Stat stat = super.setData(path, data, version);
-      checkThrowKeeperException();
-      return stat;
-    }
-  }
-}
+/*
+ * 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
+ *
+ *     http://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.hadoop.hbase.zookeeper;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.util.Properties;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.Abortable;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.Watcher;
+import org.apache.zookeeper.ZooDefs.Ids;
+import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.data.Stat;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(MediumTests.class)
+public class TestRecoverableZooKeeper {
+
+  private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+
+  Abortable abortable = new Abortable() {
+    @Override
+    public void abort(String why, Throwable e) {
+
+    }
+
+    @Override
+    public boolean isAborted() {
+      return false;
+    }
+  };
+
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception {
+    TEST_UTIL.startMiniZKCluster();
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception {
+    TEST_UTIL.shutdownMiniZKCluster();
+  }
+
+  @Test
+  public void testSetDataVersionMismatchInLoop() throws Exception {
+    String znode = "/hbase/region-in-transition/9af7cfc9b15910a0b3d714bf40a3248f";
+    Configuration conf = TEST_UTIL.getConfiguration();
+    Properties properties = ZKConfig.makeZKProps(conf);
+    ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testSetDataVersionMismatchInLoop",
+        abortable, true);
+    String ensemble = ZKConfig.getZKQuorumServersString(properties);
+    RecoverableZooKeeper rzk = ZKUtil.connect(conf, ensemble, zkw);
+    rzk.create(znode, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+    rzk.setData(znode, "OPENING".getBytes(), 0);
+    Field zkField = RecoverableZooKeeper.class.getDeclaredField("zk");
+    zkField.setAccessible(true);
+    int timeout = conf.getInt(HConstants.ZK_SESSION_TIMEOUT, HConstants.DEFAULT_ZK_SESSION_TIMEOUT);
+    ZookeeperStub zkStub = new ZookeeperStub(ensemble, timeout, zkw);
+    zkStub.setThrowExceptionInNumOperations(1);
+    zkField.set(rzk, zkStub);
+    byte[] opened = "OPENED".getBytes();
+    rzk.setData(znode, opened, 1);
+    byte[] data = rzk.getData(znode, false, new Stat());
+    assertTrue(Bytes.equals(opened, data));
+  }
+
+  class ZookeeperStub extends ZooKeeper {
+
+    private int throwExceptionInNumOperations;
+
+    public ZookeeperStub(String connectString, int sessionTimeout, Watcher watcher)
+        throws IOException {
+      super(connectString, sessionTimeout, watcher);
+    }
+
+    public void setThrowExceptionInNumOperations(int throwExceptionInNumOperations) {
+      this.throwExceptionInNumOperations = throwExceptionInNumOperations;
+    }
+
+    private void checkThrowKeeperException() throws KeeperException {
+      if (throwExceptionInNumOperations == 1) {
+        throwExceptionInNumOperations = 0;
+        throw new KeeperException.ConnectionLossException();
+      }
+      if (throwExceptionInNumOperations > 0)
+        throwExceptionInNumOperations--;
+    }
+
+    @Override
+    public Stat setData(String path, byte[] data, int version) throws KeeperException,
+        InterruptedException {
+      Stat stat = super.setData(path, data, version);
+      checkThrowKeeperException();
+      return stat;
+    }
+  }
+}



Mime
View raw message