You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/09/29 18:06:56 UTC

[2/3] storm git commit: Addressing PR comments.

Addressing PR comments.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/07d79c19
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/07d79c19
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/07d79c19

Branch: refs/heads/master
Commit: 07d79c198f174f41d68b08ad1b28f5ad84db99b6
Parents: 4af7da0
Author: Kyle Nusbaum <kn...@yahoo-inc.com>
Authored: Wed Sep 27 12:40:55 2017 -0500
Committer: Kyle Nusbaum <kn...@yahoo-inc.com>
Committed: Fri Sep 29 11:28:17 2017 -0500

----------------------------------------------------------------------
 external/storm-blobstore-migration/Makefile     | 18 +++++-
 external/storm-blobstore-migration/README.md    | 25 +++++++-
 .../storm-blobstore-migration/config.sample     | 16 +++++
 external/storm-blobstore-migration/listHDFS.sh  | 15 +++++
 external/storm-blobstore-migration/listLocal.sh | 15 +++++
 external/storm-blobstore-migration/migrate.sh   | 15 +++++
 external/storm-blobstore-migration/pom.xml      | 63 +++++++++-----------
 .../org/apache/storm/blobstore/ListHDFS.java    | 22 +++++--
 .../org/apache/storm/blobstore/ListLocalFs.java | 22 +++++--
 .../apache/storm/blobstore/MigrateBlobs.java    | 24 ++++++--
 .../apache/storm/blobstore/MigratorMain.java    | 17 ++++++
 .../org/apache/storm/blobstore/AppTest.java     | 38 ------------
 12 files changed, 200 insertions(+), 90 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/Makefile
----------------------------------------------------------------------
diff --git a/external/storm-blobstore-migration/Makefile b/external/storm-blobstore-migration/Makefile
index 891318c..b05a432 100644
--- a/external/storm-blobstore-migration/Makefile
+++ b/external/storm-blobstore-migration/Makefile
@@ -1,3 +1,19 @@
+# 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_NAME=blobstore-migrator.tgz
 
 VERSION=$(shell cat VERSION || mvn help:evaluate -Dexpression=project.version | grep -v '^\[')
@@ -10,7 +26,7 @@ $(PACKAGE_NAME) : VERSION target/blobstore-migrator-$(VERSION).jar
 	cp target/blobstore-migrator-$(VERSION).jar blobstore-migrator/
 	cp listHDFS.sh listLocal.sh migrate.sh VERSION blobstore-migrator/
 	tar -cvzf $(PACKAGE_NAME) blobstore-migrator
-#	rm -Rf blobstore-migrator
+	rm -Rf blobstore-migrator
 
 target/blobstore-migrator-$(VERSION).jar :
 	mvn clean install

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/README.md
----------------------------------------------------------------------
diff --git a/external/storm-blobstore-migration/README.md b/external/storm-blobstore-migration/README.md
index 894b9d6..28805a1 100644
--- a/external/storm-blobstore-migration/README.md
+++ b/external/storm-blobstore-migration/README.md
@@ -55,7 +55,7 @@ Now you can run any of the scripts, all of which require config to exist:
 ##### Nimbus
 To migrate blobs from nimbus, the following steps are necessary:
 
-1. Shut down Nimbus
+1. Shut down all Nimbus Instances
 2. Backup storm config
 3. Change the following settings in Nimbus' storm config:
    * blobstore.dir
@@ -64,10 +64,10 @@ To migrate blobs from nimbus, the following steps are necessary:
    * blobstore.replication.factor
    * nimbus.blobstore.class
 4. Configure server so that the environment variable `STORM_EXT_CLASSPATH` includes whatever `HADOOP_CLASSPATH` contains when `storm nimbus` is run.
-5. Run the migrate.sh script. It will migrate the blobs from the LocalFsBlobStore to the HdfsBlobStore, and then exit.
+5. Run the migrate.sh script on the master Nimbus. It will migrate the blobs from the LocalFsBlobStore to the HdfsBlobStore, and then exit.
 6. Double check to make sure the storm configs look sane, and the blobs are where they should be. (listHDFS.sh, listLocal.sh)
 
-Once everything looks good, start Nimbus and the Nimbus BlobStore migration will be done.
+Once everything looks good, start the Nimbus Instances and the Nimbus BlobStore migration will be done.
  
 If something goes wrong during this process, restore the config that you backed up in step 1 and then start Nimbus. Nimbus will use the Local Blobstore as before.
 
@@ -85,3 +85,22 @@ Supervisors can be upgraded by performing the following steps:
 5. Start the supervisor.
 
 The reason for the hard wipe of the supervisor state is due to spurious errors during supervisor migration that were only solved by wiping out the local state. This may not be the best solution, but it does seem to work predictably.
+
+## License
+
+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.

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/config.sample
----------------------------------------------------------------------
diff --git a/external/storm-blobstore-migration/config.sample b/external/storm-blobstore-migration/config.sample
index b4590ff..feb9a96 100644
--- a/external/storm-blobstore-migration/config.sample
+++ b/external/storm-blobstore-migration/config.sample
@@ -1,3 +1,19 @@
+# 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.
+
 HDFS_BLOBSTORE_DIR='hdfs://some-hdfs-namenode:8080/srv/storm/my-storm-blobstore'
 LOCAL_BLOBSTORE_DIR='/srv/storm'
 HADOOP_CLASSPATH='/hadoop-2.6.5/etc/hadoop/:/hadoop-2.6.5/share/hadoop/common/lib/*:/hadoop-2.6.5/share/hadoop/common/*:/hadoop-2.6.5/share/hadoop/hdfs:/hadoop-2.6.5/share/hadoop/hdfs/lib/*:/hadoop-2.6.5/share/hadoop/hdfs/*:/hadoop-2.6.5/share/hadoop/yarn/lib/*:/hadoop-2.6.5/share/hadoop/yarn/*:/hadoop-2.6.5/share/hadoop/mapreduce/lib/*:/hadoop-2.6.5/share/hadoop/mapreduce/*'

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/listHDFS.sh
----------------------------------------------------------------------
diff --git a/external/storm-blobstore-migration/listHDFS.sh b/external/storm-blobstore-migration/listHDFS.sh
index 42c82e6..9662a02 100755
--- a/external/storm-blobstore-migration/listHDFS.sh
+++ b/external/storm-blobstore-migration/listHDFS.sh
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+# 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.
 
 . config
 VERSION=`cat VERSION`

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/listLocal.sh
----------------------------------------------------------------------
diff --git a/external/storm-blobstore-migration/listLocal.sh b/external/storm-blobstore-migration/listLocal.sh
index db6cc33..a8a8708 100755
--- a/external/storm-blobstore-migration/listLocal.sh
+++ b/external/storm-blobstore-migration/listLocal.sh
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+# 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.
 
 . config
 VERSION=`cat VERSION`

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/migrate.sh
----------------------------------------------------------------------
diff --git a/external/storm-blobstore-migration/migrate.sh b/external/storm-blobstore-migration/migrate.sh
index 383d05b..687af32 100755
--- a/external/storm-blobstore-migration/migrate.sh
+++ b/external/storm-blobstore-migration/migrate.sh
@@ -1,4 +1,19 @@
 #!/usr/bin/env bash
+# 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.
 
 . config
 VERSION=`cat VERSION`

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-blobstore-migration/pom.xml b/external/storm-blobstore-migration/pom.xml
index e926045..c530eec 100644
--- a/external/storm-blobstore-migration/pom.xml
+++ b/external/storm-blobstore-migration/pom.xml
@@ -1,3 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -8,10 +25,10 @@
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
-    
+
     <artifactId>blobstore-migrator</artifactId>
     <packaging>jar</packaging>
-    
+
     <name>blobstore-migrator</name>
     <url>http://maven.apache.org</url>
     <dependencies>
@@ -41,11 +58,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- <dependency> -->
-        <!--     <artifactId>storm-core</artifactId> -->
-        <!--     <groupId>org.apache.storm</groupId> -->
-        <!--     <version>0.10.2.y</version> -->
-        <!-- </dependency> -->
         <dependency>
             <artifactId>hadoop-hdfs</artifactId>
             <groupId>org.apache.hadoop</groupId>
@@ -61,24 +73,7 @@
             <groupId>org.apache.hadoop</groupId>
             <version>${hadoop.version}</version>
         </dependency>
-        <dependency>
-            <groupId>yahoo.yinst.storm_hadoop_client_conf</groupId>
-            <artifactId>storm_hadoop_client_conf</artifactId>
-            <version>1.0.0.4</version>
-        </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>central-ymaven</id>
-            <url>http://ymaven.corp.yahoo.com:9999/proximity/repository/public</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
     <build>
         <plugins>
             <plugin>
@@ -90,16 +85,16 @@
                 </configuration>
             </plugin>
             <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifest>
-							<mainClass>org.apache.storm.blobstore.MigratorMain</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.apache.storm.blobstore.MigratorMain</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListHDFS.java
----------------------------------------------------------------------
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 cdf76d0..5331473 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
@@ -1,3 +1,20 @@
+/**
+ * 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.storm.blobstore;
 
 import java.util.Map;
@@ -36,17 +53,14 @@ public class ListHDFS {
         }
         
         /* CREATE THE BLOBSTORES */
-        System.out.println("Creating HDFS blobstore.");
         HdfsBlobStore hdfsBlobStore = new HdfsBlobStore();
         hdfsBlobStore.prepare(hdfsConf, null, null);
-        System.out.println("Done.");
         
         /* LOOK AT HDFS BLOBSTORE */
         System.out.println("Listing HDFS blobstore keys.");
         MigratorMain.listBlobStoreKeys(hdfsBlobStore, null);
-        System.out.println("Done.");
+        System.out.println("Done Listing HDFS blobstore keys.");
         
         hdfsBlobStore.shutdown();
-        System.out.println("Done.");
     }
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/ListLocalFs.java
----------------------------------------------------------------------
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 9a37c12..13d6316 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
@@ -1,3 +1,20 @@
+/**
+ * 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.storm.blobstore;
 
 import java.util.Map;
@@ -26,17 +43,14 @@ public class ListLocalFs {
         lfsConf.put(Config.STORM_PRINCIPAL_TO_LOCAL_PLUGIN, "org.apache.storm.security.auth.DefaultPrincipalToLocal");
         
         /* CREATE THE BLOBSTORE */
-        System.out.println("Creating Local Blobstore.");
         LocalFsBlobStore lfsBlobStore = new LocalFsBlobStore();
         lfsBlobStore.prepare(lfsConf, null, NimbusInfo.fromConf(lfsConf));
-        System.out.println("Done.");
         
         /* LOOK AT HDFS BLOBSTORE */
         System.out.println("Listing Local blobstore keys.");
         MigratorMain.listBlobStoreKeys(lfsBlobStore, null);
-        System.out.println("Done.");
+        System.out.println("Done Listing Local blobstore keys.");
         
         lfsBlobStore.shutdown();
-        System.out.println("Done.");
     }
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigrateBlobs.java
----------------------------------------------------------------------
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 92ddd29..ecc5998 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
@@ -1,3 +1,20 @@
+/**
+ * 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.storm.blobstore;
 
 import java.io.IOException;
@@ -43,7 +60,6 @@ public class MigrateBlobs {
     
     
     public static void main(String[] args) throws Exception {
-        // TODO Auto-generated method stub
         Map<String, Object> hdfsConf = Utils.readStormConfig();
         
         if (args.length < 2) {
@@ -75,15 +91,11 @@ public class MigrateBlobs {
         
         
         /* CREATE THE BLOBSTORES */
-        System.out.println("Creating Local Blobstore.");
         LocalFsBlobStore lfsBlobStore = new LocalFsBlobStore();
         lfsBlobStore.prepare(lfsConf, null, NimbusInfo.fromConf(lfsConf));
-        System.out.print("Done.");
         
-        System.out.println("Creating HDFS blobstore.");
         HdfsBlobStore hdfsBlobStore = new HdfsBlobStore();
         hdfsBlobStore.prepare(hdfsConf, null, null);
-        System.out.print("Done.");
         
         
         /* LOOK AT LOCAL BLOBSTORE */
@@ -120,6 +132,6 @@ public class MigrateBlobs {
         System.out.println("Done listing HDFS blobstore keys.");
         
         hdfsBlobStore.shutdown();
-        System.out.println("Done.");
+        System.out.println("Done Migrating!");
     }
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/src/main/java/org/apache/storm/blobstore/MigratorMain.java
----------------------------------------------------------------------
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 5f8e3fd..a18376c 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
@@ -1,3 +1,20 @@
+/**
+ * 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.storm.blobstore;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/storm/blob/07d79c19/external/storm-blobstore-migration/src/test/java/org/apache/storm/blobstore/AppTest.java
----------------------------------------------------------------------
diff --git a/external/storm-blobstore-migration/src/test/java/org/apache/storm/blobstore/AppTest.java b/external/storm-blobstore-migration/src/test/java/org/apache/storm/blobstore/AppTest.java
deleted file mode 100644
index c4652bc..0000000
--- a/external/storm-blobstore-migration/src/test/java/org/apache/storm/blobstore/AppTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.storm.blobstore;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}