Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-7656. Clean up line endings to be LF in the repo 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1438204 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Enis Soztutar 2013-01-24 21:33:39 +00:00
parent 963d5f007f
commit 6d25ad02d8
2 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/resources/hbase-webapps/static/js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

246
hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java
View File

@ -1,123 +1,123 @@
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file * or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information * distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the * to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance * "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at * with the License. You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.hadoop.hbase.zookeeper; package org.apache.hadoop.hbase.zookeeper;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.util.Properties; import java.util.Properties;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.Abortable;
import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.Watcher; import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooDefs.Ids; import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.data.Stat; import org.apache.zookeeper.data.Stat;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.BeforeClass; import org.junit.BeforeClass;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
@Category(MediumTests.class) @Category(MediumTests.class)
public class TestRecoverableZooKeeper { public class TestRecoverableZooKeeper {
private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
Abortable abortable = new Abortable() { Abortable abortable = new Abortable() {
@Override @Override
public void abort(String why, Throwable e) { public void abort(String why, Throwable e) {
} }
@Override @Override
public boolean isAborted() { public boolean isAborted() {
return false; return false;
} }
}; };
@BeforeClass @BeforeClass
public static void setUpBeforeClass() throws Exception { public static void setUpBeforeClass() throws Exception {
TEST_UTIL.startMiniZKCluster(); TEST_UTIL.startMiniZKCluster();
} }
@AfterClass @AfterClass
public static void tearDownAfterClass() throws Exception { public static void tearDownAfterClass() throws Exception {
TEST_UTIL.shutdownMiniZKCluster(); TEST_UTIL.shutdownMiniZKCluster();
} }
@Test @Test
public void testSetDataVersionMismatchInLoop() throws Exception { public void testSetDataVersionMismatchInLoop() throws Exception {
String znode = "/hbase/region-in-transition/9af7cfc9b15910a0b3d714bf40a3248f"; String znode = "/hbase/region-in-transition/9af7cfc9b15910a0b3d714bf40a3248f";
Configuration conf = TEST_UTIL.getConfiguration(); Configuration conf = TEST_UTIL.getConfiguration();
Properties properties = ZKConfig.makeZKProps(conf); Properties properties = ZKConfig.makeZKProps(conf);
ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testSetDataVersionMismatchInLoop", ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "testSetDataVersionMismatchInLoop",
abortable, true); abortable, true);
String ensemble = ZKConfig.getZKQuorumServersString(properties); String ensemble = ZKConfig.getZKQuorumServersString(properties);
RecoverableZooKeeper rzk = ZKUtil.connect(conf, ensemble, zkw); RecoverableZooKeeper rzk = ZKUtil.connect(conf, ensemble, zkw);
rzk.create(znode, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); rzk.create(znode, new byte[0], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
rzk.setData(znode, "OPENING".getBytes(), 0); rzk.setData(znode, "OPENING".getBytes(), 0);
Field zkField = RecoverableZooKeeper.class.getDeclaredField("zk"); Field zkField = RecoverableZooKeeper.class.getDeclaredField("zk");
zkField.setAccessible(true); zkField.setAccessible(true);
int timeout = conf.getInt(HConstants.ZK_SESSION_TIMEOUT, HConstants.DEFAULT_ZK_SESSION_TIMEOUT); int timeout = conf.getInt(HConstants.ZK_SESSION_TIMEOUT, HConstants.DEFAULT_ZK_SESSION_TIMEOUT);
ZookeeperStub zkStub = new ZookeeperStub(ensemble, timeout, zkw); ZookeeperStub zkStub = new ZookeeperStub(ensemble, timeout, zkw);
zkStub.setThrowExceptionInNumOperations(1); zkStub.setThrowExceptionInNumOperations(1);
zkField.set(rzk, zkStub); zkField.set(rzk, zkStub);
byte[] opened = "OPENED".getBytes(); byte[] opened = "OPENED".getBytes();
rzk.setData(znode, opened, 1); rzk.setData(znode, opened, 1);
byte[] data = rzk.getData(znode, false, new Stat()); byte[] data = rzk.getData(znode, false, new Stat());
assertTrue(Bytes.equals(opened, data)); assertTrue(Bytes.equals(opened, data));
} }
class ZookeeperStub extends ZooKeeper { class ZookeeperStub extends ZooKeeper {
private int throwExceptionInNumOperations; private int throwExceptionInNumOperations;
public ZookeeperStub(String connectString, int sessionTimeout, Watcher watcher) public ZookeeperStub(String connectString, int sessionTimeout, Watcher watcher)
throws IOException { throws IOException {
super(connectString, sessionTimeout, watcher); super(connectString, sessionTimeout, watcher);
} }
public void setThrowExceptionInNumOperations(int throwExceptionInNumOperations) { public void setThrowExceptionInNumOperations(int throwExceptionInNumOperations) {
this.throwExceptionInNumOperations = throwExceptionInNumOperations; this.throwExceptionInNumOperations = throwExceptionInNumOperations;
} }
private void checkThrowKeeperException() throws KeeperException { private void checkThrowKeeperException() throws KeeperException {
if (throwExceptionInNumOperations == 1) { if (throwExceptionInNumOperations == 1) {
throwExceptionInNumOperations = 0; throwExceptionInNumOperations = 0;
throw new KeeperException.ConnectionLossException(); throw new KeeperException.ConnectionLossException();
} }
if (throwExceptionInNumOperations > 0) if (throwExceptionInNumOperations > 0)
throwExceptionInNumOperations--; throwExceptionInNumOperations--;
} }
@Override @Override
public Stat setData(String path, byte[] data, int version) throws KeeperException, public Stat setData(String path, byte[] data, int version) throws KeeperException,
InterruptedException { InterruptedException {
Stat stat = super.setData(path, data, version); Stat stat = super.setData(path, data, version);
checkThrowKeeperException(); checkThrowKeeperException();
return stat; return stat;
} }
} }
} }