Merge pull request #251 from smkniazi/HOPS-1625

[HOPS-1625] RonDB 21.04.0

Author: smkniazi

pom.xml

@@ -25,8 +25,8 @@
 
     <dependency>
       <groupId>com.mysql.ndb</groupId>
-      <artifactId>clusterj-hops-fix</artifactId>
-      <version>8.0.21</version>
+      <artifactId>clusterj-rondb</artifactId>
+      <version>21.04.0</version>
     </dependency>
 
     <dependency>

src/main/java/io/hops/metadata/ndb/ClusterjConnector.java

@@ -386,6 +386,19 @@ private boolean format(boolean transactional,
       Class<? extends EntityDataAccess>... das) throws StorageException {
 
     final int RETRIES = 5; // in test
+
+    // we need to clear the cache objects
+    if(!transactional) {
+      // This calls the SQL truncate  command which changes the schema ID.
+      // After calling truncate we reload the schema to avoid schema ID change
+      // exceptions. However, reloading the schema invalidates the
+      // objects in the DTO cache in the ClusterJ causing NPEs.
+      // Wipe the cache before we call truncate and reload the schema
+
+      // we clear the cache for all open sessions
+      dbSessionProvider.clearCache();
+    }
+
     for (int i = 0; i < RETRIES; i++) {
       try {
         for (Class e : das) {

src/main/java/io/hops/metadata/ndb/DBSessionProvider.java

@@ -30,6 +30,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.Properties;
 import java.util.Random;
@@ -212,4 +213,12 @@ public void run() {
       }
     }
   }
+
+  public void clearCache() throws StorageException {
+    Iterator<DBSession> itr = sessionPool.iterator();
+    while(itr.hasNext()){
+      DBSession session = itr.next();
+      session.getSession().dropInstanceCache();
+    }
+  }
 }

src/main/java/io/hops/metadata/ndb/dalimpl/hdfs/LeaseCreationLocksClusterj.java

@@ -64,7 +64,6 @@ public void createLockRows(int count) throws StorageException {
         dto.setID(i);
         session.savePersistent(dto);
         session.release(dto);
-        LOG.debug("Added lease creation lock row with ID: "+i);
       }
     }
   }

src/main/java/io/hops/metadata/ndb/wrapper/HopsSession.java

@@ -262,11 +262,19 @@ public String unloadSchema(Class<?> aClass) throws StorageException {
       throw HopsExceptionHelper.wrap(e);
     }
   }
-  
+
+  public void dropInstanceCache() throws StorageException {
+    try {
+      session.dropInstanceCache();
+    } catch (ClusterJException e) {
+      throw HopsExceptionHelper.wrap(e);
+    }
+  }
+
   public <T> void release(T t)  throws StorageException {
     try {
       if(t!=null){
-        session.release(t);
+        session.releaseCache(t, t.getClass());
       }
     } catch (ClusterJException e) {
       throw HopsExceptionHelper.wrap(e);
@@ -277,7 +285,7 @@ public <T> void release(Collection<T> t)  throws StorageException {
     try {
       if(t!=null){
         for(T dto : t)  {
-          session.release(dto);
+          session.releaseCache(dto, dto.getClass());
         }
       }
     } catch (ClusterJException e) {

src/main/resources/ndb-config.properties.template

@@ -1,18 +1,15 @@
-#
-#    Do not add spaces in the file. it is also used by some deployment scripts that fail if there are redundant spaces
-#
-com.mysql.clusterj.connectstring=cloud1.sics.se
-com.mysql.clusterj.database=hop_bram_vm
+com.mysql.clusterj.connectstring=localhost
+com.mysql.clusterj.database=hops_db
 com.mysql.clusterj.connection.pool.size=1
 com.mysql.clusterj.max.transactions=1024
-#com.mysql.clusterj.connection.pool.nodeids=
+com.mysql.clusterj.max.cached.instances=1024
 
 io.hops.metadata.ndb.mysqlserver.data_source_class_name = com.mysql.cj.jdbc.MysqlDataSource
 
-io.hops.metadata.ndb.mysqlserver.host=
+io.hops.metadata.ndb.mysqlserver.host=localhost
 io.hops.metadata.ndb.mysqlserver.port=3306
-io.hops.metadata.ndb.mysqlserver.username=
-io.hops.metadata.ndb.mysqlserver.password=
+io.hops.metadata.ndb.mysqlserver.username=username
+io.hops.metadata.ndb.mysqlserver.password=password
 io.hops.metadata.ndb.mysqlserver.connection_pool_size=1
 
 #size of the session pool. should be altreat as big as the number of active RPC handling Threads in the system