This is an automated email from the ASF dual-hosted git repository.
srdo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new 83be1b9 STORM-3452: blobstore-migration: fix all checkstyle warnings
new 3cb335e Merge pull request #3070 from
krichter722/checkstyle-blobstore-migration
83be1b9 is described below
commit 83be1b9c015255162df41085b138c36921350ded
Author: Karl-Philipp Richter <krich...@posteo.de>
AuthorDate: Thu Jul 4 21:06:50 2019 +0200
STORM-3452: blobstore-migration: fix all checkstyle warnings
---
external/storm-blobstore-migration/pom.xml | 2 +-
.../java/org/apache/storm/blobstore/ListHDFS.java | 20 ++++++----
.../org/apache/storm/blobstore/ListLocalFs.java | 3 +-
.../org/apache/storm/blobstore/MigrateBlobs.java | 44 +++++++++++++---------
.../org/apache/storm/blobstore/MigratorMain.java | 20 +++++-----
5 files changed, 50 insertions(+), 39 deletions(-)
diff --git a/external/storm-blobstore-migration/pom.xml
b/external/storm-blobstore-migration/pom.xml
index 69d4c5e..d7c2eb2 100644
--- a/external/storm-blobstore-migration/pom.xml
+++ b/external/storm-blobstore-migration/pom.xml
@@ -129,7 +129,7 @@ limitations under the License.
<artifactId>maven-checkstyle-plugin</artifactId>
<!--Note - the version would be inherited-->
<configuration>
- <maxAllowedViolations>56</maxAllowedViolations>
+ <maxAllowedViolations>0</maxAllowedViolations>
</configuration>
</plugin>
<plugin>
diff --git
a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListHDFS.java
b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListHDFS.java
index 3f4566e..96e7038 100644
---
a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListHDFS.java
+++
b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListHDFS.java
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.storm.blobstore;
import java.util.Map;
@@ -27,14 +28,17 @@ import org.apache.storm.hdfs.blobstore.HdfsBlobStore;
import org.apache.storm.hdfs.blobstore.HdfsClientBlobStore;
import org.apache.storm.utils.Utils;
+@SuppressWarnings("checkstyle:AbbreviationAsWordInName")
public class ListHDFS {
public static void main(String[] args) throws Exception {
- if(args.length < 1) {
+ if (args.length < 1) {
System.out.println("Need at least 1 argument
(hdfs_blobstore_path), but have " + Integer.toString(args.length));
System.out.println("listHDFS <hdfs_blobstore_path>
<hdfs_principal> <keytab>");
System.out.println("Lists blobs in HdfsBlobStore");
- System.out.println("Example: listHDFS
'hdfs://some-hdfs-namenode:8080/srv/storm/my-storm-blobstore'
'stormUser/my-nimbus-host.example....@storm.example.com'
'/srv/my-keytab/stormUser.kt'");
+ System.out.println("Example: listHDFS "
+ +
"'hdfs://some-hdfs-namenode:8080/srv/storm/my-storm-blobstore' "
+ +
"'stormUser/my-nimbus-host.example....@storm.example.com'
'/srv/my-keytab/stormUser.kt'");
System.exit(1);
}
@@ -43,13 +47,13 @@ public class ListHDFS {
hdfsConf.put(Config.BLOBSTORE_DIR, hdfsBlobstorePath);
hdfsConf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,
"org.apache.storm.security.auth.DefaultPrincipalToLocal");
- if(args.length >= 2) {
- System.out.println("SETTING HDFS PRINCIPAL!");
- hdfsConf.put(Config.BLOBSTORE_HDFS_PRINCIPAL, args[1]);
+ if (args.length >= 2) {
+ System.out.println("SETTING HDFS PRINCIPAL!");
+ hdfsConf.put(Config.BLOBSTORE_HDFS_PRINCIPAL, args[1]);
}
- if(args.length >= 3) {
- System.out.println("SETTING HDFS KEYTAB!");
- hdfsConf.put(Config.BLOBSTORE_HDFS_KEYTAB, args[2]);
+ if (args.length >= 3) {
+ System.out.println("SETTING HDFS KEYTAB!");
+ hdfsConf.put(Config.BLOBSTORE_HDFS_KEYTAB, args[2]);
}
/* CREATE THE BLOBSTORES */
diff --git
a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListLocalFs.java
b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListLocalFs.java
index 35ff33f..aefddb8 100644
---
a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListLocalFs.java
+++
b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListLocalFs.java
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.storm.blobstore;
import java.util.Map;
@@ -30,7 +31,7 @@ public class ListLocalFs {
public static void main(String[] args) throws Exception {
- if(args.length != 1) {
+ if (args.length != 1) {
System.out.println("Need 1 arguments, but have " +
Integer.toString(args.length));
System.out.println("listLocalFs <local_blobstore_dir>");
System.out.println("Migrates blobs from LocalFsBlobStore to
HdfsBlobStore");
diff --git
a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigrateBlobs.java
b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigrateBlobs.java
index 4e2628b..aae81fd 100644
---
a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigrateBlobs.java
+++
b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigrateBlobs.java
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.storm.blobstore;
import java.io.IOException;
@@ -26,31 +27,36 @@ import javax.security.auth.login.LoginContext;
import org.apache.storm.Config;
import org.apache.storm.blobstore.BlobStore;
-import org.apache.storm.hdfs.blobstore.HdfsBlobStore;
-import org.apache.storm.nimbus.NimbusInfo;
-import org.apache.storm.utils.Utils;
import org.apache.storm.blobstore.LocalFsBlobStore;
import org.apache.storm.generated.AuthorizationException;
import org.apache.storm.generated.KeyAlreadyExistsException;
import org.apache.storm.generated.KeyNotFoundException;
import org.apache.storm.generated.ReadableBlobMeta;
import org.apache.storm.generated.SettableBlobMeta;
+import org.apache.storm.hdfs.blobstore.HdfsBlobStore;
+import org.apache.storm.nimbus.NimbusInfo;
+import org.apache.storm.utils.Utils;
public class MigrateBlobs {
protected static void deleteAllBlobStoreKeys(BlobStore bs, Subject who)
throws AuthorizationException, KeyNotFoundException {
Iterable<String> hdfsKeys = () -> bs.listKeys();
- for(String key : hdfsKeys) {
+ for (String key : hdfsKeys) {
System.out.println(key);
bs.deleteBlob(key, who);
}
}
- protected static void copyBlobStoreKeys(BlobStore bsFrom, Subject whoFrom,
BlobStore bsTo, Subject whoTo) throws AuthorizationException,
KeyAlreadyExistsException, IOException, KeyNotFoundException {
+ protected static void copyBlobStoreKeys(BlobStore bsFrom,
+ Subject whoFrom,
+ BlobStore bsTo, Subject whoTo) throws AuthorizationException,
+ KeyAlreadyExistsException,
+ IOException,
+ KeyNotFoundException {
Iterable<String> lfsKeys = () -> bsFrom.listKeys();
- for(String key : lfsKeys) {
- ReadableBlobMeta readable_meta = bsFrom.getBlobMeta(key, whoFrom);
- SettableBlobMeta meta = readable_meta.get_settable();
+ for (String key : lfsKeys) {
+ ReadableBlobMeta readableMeta = bsFrom.getBlobMeta(key, whoFrom);
+ SettableBlobMeta meta = readableMeta.get_settable();
InputStream in = bsFrom.getBlob(key, whoFrom);
System.out.println("COPYING BLOB " + key + " FROM " + bsFrom + "
TO " + bsTo);
bsTo.createBlob(key, in, meta, whoTo);
@@ -66,30 +72,32 @@ public class MigrateBlobs {
System.out.println("Need at least 2 arguments, but have " +
Integer.toString(args.length));
System.out.println("migrate <local_blobstore_dir>
<hdfs_blobstore_path> <hdfs_principal> <keytab>");
System.out.println("Migrates blobs from LocalFsBlobStore to
HdfsBlobStore");
- System.out.println("Example: migrate '/srv/storm'
'hdfs://some-hdfs-namenode:8080/srv/storm/my-storm-blobstore'
'stormUser/my-nimbus-host.example....@storm.example.com'
'/srv/my-keytab/stormUser.kt'");
+ System.out.println("Example: migrate '/srv/storm' "
+ +
"'hdfs://some-hdfs-namenode:8080/srv/storm/my-storm-blobstore' "
+ +
"'stormUser/my-nimbus-host.example....@storm.example.com'
'/srv/my-keytab/stormUser.kt'");
System.exit(1);
}
-
- String localBlobstoreDir = args[0];
+
String hdfsBlobstorePath = args[1];
hdfsConf.put(Config.BLOBSTORE_DIR, hdfsBlobstorePath);
hdfsConf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,
"org.apache.storm.security.auth.DefaultPrincipalToLocal");
- if(args.length >= 3) {
- System.out.println("SETTING HDFS PRINCIPAL!");
- hdfsConf.put(Config.BLOBSTORE_HDFS_PRINCIPAL, args[2]);
+ if (args.length >= 3) {
+ System.out.println("SETTING HDFS PRINCIPAL!");
+ hdfsConf.put(Config.BLOBSTORE_HDFS_PRINCIPAL, args[2]);
}
- if(args.length >= 4) {
- System.out.println("SETTING HDFS KEYTAB!");
- hdfsConf.put(Config.BLOBSTORE_HDFS_KEYTAB, args[3]);
+ if (args.length >= 4) {
+ System.out.println("SETTING HDFS KEYTAB!");
+ hdfsConf.put(Config.BLOBSTORE_HDFS_KEYTAB, args[3]);
}
hdfsConf.put(Config.STORM_BLOBSTORE_REPLICATION_FACTOR, 7);
Map<String, Object> lfsConf = Utils.readStormConfig();
+ String localBlobstoreDir = args[0];
lfsConf.put(Config.BLOBSTORE_DIR, localBlobstoreDir);
lfsConf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN,
"org.apache.storm.security.auth.DefaultPrincipalToLocal");
-
+
/* CREATE THE BLOBSTORES */
LocalFsBlobStore lfsBlobStore = new LocalFsBlobStore();
lfsBlobStore.prepare(lfsConf, null, NimbusInfo.fromConf(lfsConf),
null);
diff --git
a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigratorMain.java
b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigratorMain.java
index a18376c..03d163a 100644
---
a/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigratorMain.java
+++
b/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigratorMain.java
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.storm.blobstore;
import java.util.Arrays;
@@ -22,10 +23,10 @@ import java.util.Arrays;
import javax.security.auth.Subject;
public class MigratorMain {
-
- public static void listBlobStoreKeys(BlobStore bs, Subject who) {
+
+ public static void listBlobStoreKeys(BlobStore bs, Subject who) {
Iterable<String> bsKeys = () -> bs.listKeys();
- for(String key : bsKeys) {
+ for (String key : bsKeys) {
System.out.println(key);
}
}
@@ -38,20 +39,17 @@ public class MigratorMain {
}
public static void main(String[] args) throws Exception {
- if(args.length == 0) {
+ if (args.length == 0) {
usage();
}
- if(args[0].equals("listHDFS")) {
+ if (args[0].equals("listHDFS")) {
ListHDFS.main(Arrays.copyOfRange(args, 1, args.length));
- }
- else if(args[0].equals("listLocalFs")) {
+ } else if (args[0].equals("listLocalFs")) {
ListLocalFs.main(Arrays.copyOfRange(args, 1, args.length));
- }
- else if(args[0].equals("migrate")) {
+ } else if (args[0].equals("migrate")) {
MigrateBlobs.main(Arrays.copyOfRange(args, 1, args.length));
- }
- else {
+ } else {
System.out.println("Not recognized: " + args[0]);
usage();
}
