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

HBASE-12355 Update maven plugins

This commit is contained in:
stack 2014-10-29 13:11:44 -07:00
parent 0fa43bd574
commit fba164a1d1
14 changed files with 72 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-checkstyle/pom.xml
View File

@ -53,6 +53,7 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<executions>
<execution>
@ -69,4 +70,4 @@
</plugin>
</plugins>
</build>
</project>
</project>

2
hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java
View File

@ -51,7 +51,7 @@ public class JMXListener implements Coprocessor {
public static final Log LOG = LogFactory.getLog(JMXListener.class);
public static final String RMI_REGISTRY_PORT_CONF_KEY = ".rmi.registry.port";
public static final String RMI_CONNECTOR_PORT_CONF_KEY = ".rmi.connector.port";
public static int defRMIRegistryPort = 10102;
public static final int defRMIRegistryPort = 10102;
/**
* workaround for HBASE-11146

4
hbase-server/src/main/java/org/apache/hadoop/hbase/coordination/ZKSplitLogManagerCoordination.java
View File

@ -98,8 +98,6 @@ public class ZKSplitLogManagerCoordination extends ZooKeeperListener implements
SplitLogManagerDetails details;
private final Stoppable stopper = null;
// When lastRecoveringNodeCreationTime is older than the following threshold, we'll check
// whether to GC stale recovering znodes
private volatile long lastRecoveringNodeCreationTime = 0;
@ -669,7 +667,7 @@ public class ZKSplitLogManagerCoordination extends ZooKeeperListener implements
} catch (InterruptedException e) {
throw new InterruptedIOException();
}
} while ((--retries) > 0 && (!this.stopper.isStopped()));
} while ((--retries) > 0);
}
}

2
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
View File

@ -146,7 +146,7 @@ import com.google.protobuf.TextFormat;
* and keep taking while the server is up.
*
* CallRunner#run executes the call. When done, asks the included Call to put itself on new
* queue for {@link Responder} to pull from and return result to client.
* queue for Responder to pull from and return result to client.
*
* @see RpcClient
*/

2
hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
View File

@ -526,7 +526,7 @@ public abstract class BaseLoadBalancer implements LoadBalancer {
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="NM_FIELD_NAMING_CONVENTION",
justification="Mistake. Too disruptive to change now")
public static Action NullAction = new Action(Type.NULL);
public static final Action NullAction = new Action(Type.NULL);
public void doAction(Action action) {
switch (action.type) {

2
hbase-server/src/main/java/org/apache/hadoop/hbase/quotas/QuotaCache.java
View File

@ -209,6 +209,8 @@ public class QuotaCache implements Stoppable {
}
@Override
@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="GC_UNRELATED_TYPES",
justification="I do not understand why the complaints, it looks good to me -- FIX")
protected void chore() {
// Prefetch online tables/namespaces
for (TableName table: QuotaCache.this.rsServices.getOnlineTables()) {

22
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DelimitedKeyPrefixRegionSplitPolicy.java
View File

@ -50,20 +50,14 @@ public class DelimitedKeyPrefixRegionSplitPolicy extends IncreasingToUpperBoundR
@Override
protected void configureForRegion(HRegion region) {
super.configureForRegion(region);
if (region != null) {
// read the prefix length from the table descriptor
String delimiterString = region.getTableDesc().getValue(
DELIMITER_KEY);
if (delimiterString == null || delimiterString.length() == 0) {
LOG.error(DELIMITER_KEY + " not specified for table "
+ region.getTableDesc().getTableName()
+ ". Using default RegionSplitPolicy");
return;
}
delimiter = Bytes.toBytes(delimiterString);
// read the prefix length from the table descriptor
String delimiterString = region.getTableDesc().getValue(DELIMITER_KEY);
if (delimiterString == null || delimiterString.length() == 0) {
LOG.error(DELIMITER_KEY + " not specified for table " + region.getTableDesc().getTableName() +
". Using default RegionSplitPolicy");
return;
}
delimiter = Bytes.toBytes(delimiterString);
}
@Override
@ -85,4 +79,4 @@ public class DelimitedKeyPrefixRegionSplitPolicy extends IncreasingToUpperBoundR
return splitPoint;
}
}
}
}

50
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyPrefixRegionSplitPolicy.java
View File

@ -43,36 +43,34 @@ public class KeyPrefixRegionSplitPolicy extends IncreasingToUpperBoundRegionSpli
@Override
protected void configureForRegion(HRegion region) {
super.configureForRegion(region);
if (region != null) {
prefixLength = 0;
prefixLength = 0;
// read the prefix length from the table descriptor
String prefixLengthString = region.getTableDesc().getValue(
PREFIX_LENGTH_KEY);
// read the prefix length from the table descriptor
String prefixLengthString = region.getTableDesc().getValue(
PREFIX_LENGTH_KEY);
if (prefixLengthString == null) {
//read the deprecated value
prefixLengthString = region.getTableDesc().getValue(PREFIX_LENGTH_KEY_DEPRECATED);
if (prefixLengthString == null) {
//read the deprecated value
prefixLengthString = region.getTableDesc().getValue(PREFIX_LENGTH_KEY_DEPRECATED);
if (prefixLengthString == null) {
LOG.error(PREFIX_LENGTH_KEY + " not specified for table "
+ region.getTableDesc().getTableName()
+ ". Using default RegionSplitPolicy");
return;
}
}
try {
prefixLength = Integer.parseInt(prefixLengthString);
} catch (NumberFormatException nfe) {
/* Differentiate NumberFormatException from an invalid value range reported below. */
LOG.error("Number format exception when parsing " + PREFIX_LENGTH_KEY + " for table "
+ region.getTableDesc().getTableName() + ":"
+ prefixLengthString + ". " + nfe);
LOG.error(PREFIX_LENGTH_KEY + " not specified for table "
+ region.getTableDesc().getTableName()
+ ". Using default RegionSplitPolicy");
return;
}
if (prefixLength <= 0) {
LOG.error("Invalid value for " + PREFIX_LENGTH_KEY + " for table "
+ region.getTableDesc().getTableName() + ":"
+ prefixLengthString + ". Using default RegionSplitPolicy");
}
}
try {
prefixLength = Integer.parseInt(prefixLengthString);
} catch (NumberFormatException nfe) {
/* Differentiate NumberFormatException from an invalid value range reported below. */
LOG.error("Number format exception when parsing " + PREFIX_LENGTH_KEY + " for table "
+ region.getTableDesc().getTableName() + ":"
+ prefixLengthString + ". " + nfe);
return;
}
if (prefixLength <= 0) {
LOG.error("Invalid value for " + PREFIX_LENGTH_KEY + " for table "
+ region.getTableDesc().getTableName() + ":"
+ prefixLengthString + ". Using default RegionSplitPolicy");
}
}

4
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
View File

@ -2048,9 +2048,7 @@ public class HLogSplitter {
}
((Put) m).add(tmpNewCell);
}
if (m != null) {
m.setDurability(durability);
}
m.setDurability(durability);
previousCell = cell;
}

4
hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
View File

@ -1296,7 +1296,7 @@ public class AccessController extends BaseMasterAndRegionObserver
ourFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL,
Lists.newArrayList(ourFilter, filter));
}
authResult.setAllowed(true);;
authResult.setAllowed(true);
authResult.setReason("Access allowed with filter");
switch (opType) {
case GET:
@ -1322,7 +1322,7 @@ public class AccessController extends BaseMasterAndRegionObserver
ourFilter = new FilterList(FilterList.Operator.MUST_PASS_ALL,
Lists.newArrayList(ourFilter, filter));
}
authResult.setAllowed(true);;
authResult.setAllowed(true);
authResult.setReason("Access allowed with filter");
switch (opType) {
case GET:

2
hbase-server/src/main/java/org/apache/hadoop/hbase/util/CompressionTest.java
View File

@ -127,7 +127,7 @@ public class CompressionTest {
// Write any-old Cell...
final byte [] rowKey = Bytes.toBytes("compressiontestkey");
Cell c = CellUtil.createCell(rowKey, Bytes.toBytes("compressiontestval"));
writer.append(c);;
writer.append(c);
writer.appendFileInfo(Bytes.toBytes("compressioninfokey"), Bytes.toBytes("compressioninfoval"));
writer.close();
Cell cc = null;

20
hbase-server/src/main/java/org/apache/hadoop/hbase/util/MultiHConnection.java
View File

@ -77,20 +77,18 @@ public class MultiHConnection {
public void close() {
synchronized (hConnectionsLock) {
if (hConnections != null) {
if (hConnections != null) {
for (Connection conn : hConnections) {
if (conn != null) {
try {
conn.close();
} catch (IOException e) {
LOG.info("Got exception in closing connection", e);
} finally {
conn = null;
}
for (Connection conn : hConnections) {
if (conn != null) {
try {
conn.close();
} catch (IOException e) {
LOG.info("Got exception in closing connection", e);
} finally {
conn = null;
}
}
hConnections = null;
}
hConnections = null;
}
}
if (this.batchPool != null && !this.batchPool.isShutdown()) {

24
hbase-thrift/pom.xml
View File

@ -93,6 +93,15 @@
</goals>
<configuration>
<skip>true</skip>
<properties>
<property>
<name>listener</name>
<value>org.apache.hadoop.hbase.ServerResourceCheckerJUnitListener</value>
</property>
</properties>
<systemPropertyVariables>
<test.build.webapps>target/test-classes/webapps</test.build.webapps>
</systemPropertyVariables>
</configuration>
</execution>
</executions>
@ -159,21 +168,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<!-- Testing plugins -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<properties>
<property>
<name>listener</name>
<value>org.apache.hadoop.hbase.ServerResourceCheckerJUnitListener</value>
</property>
</properties>
<systemPropertyVariables>
<test.build.webapps>target/test-classes/webapps</test.build.webapps>
</systemPropertyVariables>
</configuration>
</plugin>
</plugins>
</build>

29
pom.xml
View File

@ -416,16 +416,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.4.1</version>
<!--Making a release I've been using mvn 3.0 and specifying the apache-release
profile on the command line as follows:
$ ~/bin/mvn/bin/mvn -Papache-release release:perform
I've also been kiling the release:prepare step mid-way to check the
release.properties it generates at the top-level. Sometimes it refers
to HEAD rather than to the svn branch.
-->
<configuration>
<!--You need this profile. It'll sign your artifacts.
I'm not sure if this config. actually works though.
@ -440,6 +430,7 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<configuration>
@ -469,6 +460,7 @@
</plugin>
<!-- Test oriented plugins -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
<dependencies>
@ -514,10 +506,12 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>${surefire.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
@ -532,7 +526,8 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs-maven-plugin.version}</version>
<version>3.0.0</version>
<!--NOTE: Findbugs 3.0.0 requires jdk7-->
<configuration>
<excludeFilterFile>${project.basedir}/../dev-support/findbugs-exclude.xml</excludeFilterFile>
<findbugsXmlOutput>true</findbugsXmlOutput>
@ -543,7 +538,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.5</version>
<version>1.9.1</version>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@ -599,7 +594,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.8</version>
<version>2.9</version>
</plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It
has no influence on the Maven build itself. m2e does not provide any safeguards against
@ -616,7 +611,7 @@
<!-- excludes are inherited -->
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.8</version>
<version>0.11</version>
<configuration>
<excludes>
<exclude>**/*.versionsBackup</exclude>
@ -843,7 +838,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>${maven.resources.plugin.version}</version>
<!--$NO-MVN-MAN-VER$ -->
<inherited>false</inherited>
<executions>
@ -891,7 +885,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven.site.version}</version>
<version>3.4</version>
<inherited>false</inherited>
<dependencies>
<dependency>
@ -983,11 +977,8 @@
<maven.assembly.version>2.4</maven.assembly.version>
<maven.antrun.version>1.6</maven.antrun.version>
<jamon.plugin.version>2.3.4</jamon.plugin.version>
<findbugs-maven-plugin.version>2.5.2</findbugs-maven-plugin.version>
<findbugs-annotations>1.3.9-1</findbugs-annotations>
<maven.site.version>3.3</maven.site.version>
<javadoc.version>2.9</javadoc.version>
<maven.resources.plugin.version>2.6</maven.resources.plugin.version>
<!-- General Packaging -->
<package.prefix>/usr</package.prefix>
<package.conf.dir>/etc/hbase</package.conf.dir>