Setup testcontainers for hbase [tp-tests]

.github/workflows/ci-backend-hbase.yml

@@ -60,27 +60,27 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - module: hbase-parent/janusgraph-hbase-10
+          - module: hbase
             args: "-Dtest=\"**/diskstorage/hbase/*\""
-            name: hbase-10-diskstorage
-          - module: hbase-parent/janusgraph-hbase-10
+            name: hbase1-diskstorage
+          - module: hbase
             args: "-Dtest=\"**/graphdb/hbase/*\""
-            name: hbase-10-graphdb
-          - module: hbase-parent/janusgraph-hbase-10
+            name: hbase1-graphdb
+          - module: hbase
             args: "-Dtest=\"**/hadoop/*\""
-            name: hbase-10-hadoop
-          - module: hbase-parent/janusgraph-hbase-10
+            name: hbase1-hadoop
+          - module: hbase
             install-args: "-Dhbase.profile -Phbase2"
             args: "-Dtest=\"**/diskstorage/hbase/*\""
-            name: hbase-2-diskstorage
-          - module: hbase-parent/janusgraph-hbase-10
+            name: hbase2-diskstorage
+          - module: hbase
             install-args: "-Dhbase.profile -Phbase2"
             args: "-Dtest=\"**/graphdb/hbase/*\""
-            name: hbase-2-graphdb
-          - module: hbase-parent/janusgraph-hbase-10
+            name: hbase2-graphdb
+          - module: hbase
             install-args: "-Dhbase.profile -Phbase2"
             args: "-Dtest=\"**/hadoop/*\""
-            name: hbase-2-hadoop
+            name: hbase2-hadoop
     steps:
       - uses: actions/checkout@v2
         with:
@@ -95,7 +95,7 @@ jobs:
         with:
           java-version: 1.8
       - run: mvn clean install --projects janusgraph-${{ matrix.module }} ${{ env.BUILD_MAVEN_OPTS }} ${{ matrix.install-args }}
-      - run: mvn verify --projects janusgraph-${{ matrix.module }} ${{ env.VERIFY_MAVEN_OPTS }} ${{ matrix.args }}
+      - run: mvn verify --projects janusgraph-${{ matrix.module }} ${{ env.VERIFY_MAVEN_OPTS }} ${{ matrix.args }} -Dhbase.docker.uid=$(id -u) -Dhbase.docker.gid=$(id -g)
       - uses: actions/upload-artifact@v2
         with:
           name: jacoco-reports

.github/workflows/ci-release.yml

@@ -94,9 +94,9 @@ jobs:
             args: "-Pcassandra3-byteordered -Dtest.skip.tp=false -DskipTests=true"
           - module: cql
             args: "-Pcassandra3-murmur -Dtest.skip.tp=false -DskipTests=true"
-          - module: hbase-parent/janusgraph-hbase-10
+          - module: hbase
             args: "-Dtest.skip.tp=false -DskipTests=true"
-          - module: hbase-parent/janusgraph-hbase-10
+          - module: hbase
             install-args: "-Dhbase.profile -Phbase2"
             args: "-Dtest.skip.tp=false -DskipTests=true"
     steps:

.gitignore

@@ -33,10 +33,6 @@ target/
 /janusgraph-examples/example-*/.project
 /janusgraph-examples/example-*/.settings
 # End of Eclipse junk
-# HBase testing stuff
-janusgraph-hbase/logs
-janusgraph-hbase/src/test/janusgraph-hbase-test-data/*
-janusgraph-hbase/src/test/janusgraph-zookeeper-test/*
 # Backup files created by `mvn versions:update-child-modules`
 # http://mojo.codehaus.org/versions-maven-plugin/update-child-modules-mojo.html
 janusgraph-*/pom.xml.versionsBackup

TESTING.md

@@ -156,6 +156,20 @@ mvn clean install -pl janusgraph-cql -Dcassandra.docker.image=cassandra
 mvn clean install -pl janusgraph-cql -Dcassandra.docker.image=cassandra -Dcassandra.docker.version=3.11.2
 ```
 
+### Running hbase tests
+
+**Note** Running HBase tests require Docker.
+
+### Special versions of HBase
+
+System properties to configure HBase test executions:
+
+| Property | Description | Default value |
+| -------- | ----------- | ------------- |
+| `hbase.docker.version` | HBase version to be used in the docker image. | `2.2.7` |
+| `hbase.docker.uid` | Uid used to run inside HBase of the container | 1000 |
+| `hbase.docker.gid` | Gid used to run inside HBase of the container | 1000 |
+
 ### TinkerPop tests
 
 The CQL backend is tested with TinkerPop tests using following command. 

docs/changelog.md

@@ -27,7 +27,7 @@ All currently supported verions of JanusGraph are listed below.
 | JanusGraph | Storage Version | Cassandra | HBase | Bigtable | Elasticsearch | Solr | TinkerPop | Spark | Scala |
 | ----- | ---- | ---- | ---- | ---- | ---- | ---- | --- | ---- | ---- |
 | 0.5.z | 2 | 2.1.z, 2.2.z, 3.0.z, 3.11.z | 1.2.z, 1.3.z, 1.4.z, 2.1.z | 1.3.0, 1.4.0, 1.5.z, 1.6.z, 1.7.z, 1.8.z, 1.9.z, 1.10.z, 1.11.z, 1.14.z | 6.y, 7.y | 7.y | 3.4.z | 2.2.z | 2.11.z | 
-| 0.6.z | 2 | 3.0.z, 3.11.z | 1.2.z, 1.3.z, 1.4.z, 2.1.z | 1.3.0, 1.4.0, 1.5.z, 1.6.z, 1.7.z, 1.8.z, 1.9.z, 1.10.z, 1.11.z, 1.14.z | 6.y, 7.y | 7.y, 8.y | 3.4.z | 2.2.z | 2.11.z | 
+| 0.6.z | 2 | 3.0.z, 3.11.z | 1.6.z, 2.2.z | 1.3.0, 1.4.0, 1.5.z, 1.6.z, 1.7.z, 1.8.z, 1.9.z, 1.10.z, 1.11.z, 1.14.z | 6.y, 7.y | 7.y, 8.y | 3.4.z | 2.2.z | 2.11.z | 
 
 #### End-of-Life
 The versions of JanusGraph listed below are outdated and will no longer receive bugfixes.
@@ -58,7 +58,7 @@ compile "org.janusgraph:janusgraph-core:0.6.0"
 **Tested Compatibility:**
 
 * Apache Cassandra 3.0.14, 3.11.10
-* Apache HBase 1.2.6, 1.3.1, 1.4.10, 1.6.0, 2.1.5
+* Apache HBase 1.6.0, 2.2.7
 * Google Bigtable 1.3.0, 1.4.0, 1.5.0, 1.6.0, 1.7.0, 1.8.0, 1.9.0, 1.10.0, 1.11.0, 1.14.0
 * Oracle BerkeleyJE 7.5.11
 * Elasticsearch 6.0.1, 6.6.0, 7.12.0

janusgraph-backend-testutils/src/main/java/org/janusgraph/diskstorage/DistributedStoreManagerTest.java

@@ -16,7 +16,6 @@
 
 import org.janusgraph.JanusGraphBaseStoreFeaturesTest;
 import org.janusgraph.diskstorage.common.DistributedStoreManager;
-import org.janusgraph.diskstorage.common.DistributedStoreManager.Deployment;
 import org.janusgraph.diskstorage.keycolumnvalue.KeyColumnValueStore;
 import org.janusgraph.diskstorage.keycolumnvalue.KeyRange;
 import org.janusgraph.diskstorage.keycolumnvalue.StoreFeatures;
@@ -39,12 +38,6 @@ public StoreFeatures getStoreFeatures(){
         return manager.getFeatures();
     }
 
-    @Test
-    @FeatureFlag(feature = JanusGraphFeature.OrderedScan)
-    public void testGetDeployment() {
-        assertEquals(Deployment.LOCAL, manager.getDeployment());
-    }
-
     @Test
     @FeatureFlag(feature = JanusGraphFeature.OrderedScan)
     public void testGetLocalKeyPartition() throws BackendException {

janusgraph-cql/src/test/java/org/janusgraph/diskstorage/cql/CQLDistributedStoreManagerTest.java

@@ -17,19 +17,12 @@
 import org.janusgraph.JanusGraphCassandraContainer;
 import org.janusgraph.diskstorage.BackendException;
 import org.janusgraph.diskstorage.DistributedStoreManagerTest;
-import org.janusgraph.diskstorage.common.DistributedStoreManager.Deployment;
 import org.janusgraph.diskstorage.configuration.ModifiableConfiguration;
-import org.janusgraph.testutil.FeatureFlag;
-import org.janusgraph.testutil.JanusGraphFeature;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 @Testcontainers
 public class CQLDistributedStoreManagerTest extends DistributedStoreManagerTest<CQLStoreManager> {
 
@@ -51,13 +44,4 @@ public void tearDown() throws BackendException {
         if (null != manager)
             manager.close();
     }
-
-    @Override
-    @Test
-    @FeatureFlag(feature = JanusGraphFeature.OrderedScan)
-    @Disabled(value = "Test can't run inside of a container")
-    public void testGetDeployment() {
-        final Deployment deployment = Deployment.LOCAL;
-        assertEquals(deployment, manager.getDeployment());
-    }
 }

janusgraph-dist/pom.xml

@@ -69,6 +69,14 @@
                     <groupId>com.google.code.gson</groupId>
                     <artifactId>gson</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.htrace</groupId>
+                    <artifactId>htrace-core4</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -123,7 +131,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>janusgraph-hbase-core</artifactId>
+            <artifactId>janusgraph-hbase</artifactId>
             <version>${project.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>

janusgraph-hadoop/pom.xml

@@ -91,8 +91,21 @@
                     <groupId>org.apache.commons</groupId>
                     <artifactId>commons-compress</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.htrace</groupId>
+                    <artifactId>htrace-core4</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.htrace</groupId>
+            <artifactId>htrace-core4</artifactId>
+            <version>${htrace.version}</version>
+        </dependency>
 
         <!-- JANUSGRAPH -->
         <dependency>