From 5194ff828a4cc99aa7aef96261b2ca1b405e47d1 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Mon, 2 Dec 2024 14:47:11 +0200
Subject: [PATCH 01/29] Publish hdfs modifications

---
 hadoop/stable-base/pom.xml                    |   7 -
 hadoop/stable/pom.xml                         | 320 ++++++++++++++++--
 .../resources/common-version-info.properties  |   0
 ...pache.hadoop.crypto.key.KeyProviderFactory |  23 ++
 .../services/org.apache.hadoop.fs.FileSystem  |  23 ++
 ...apache.hadoop.io.compress.CompressionCodec |  21 ++
 ...rasurecode.rawcoder.RawErasureCoderFactory |  18 +
 .../org.apache.hadoop.security.SecurityInfo   |  14 +
 ...p.security.alias.CredentialProviderFactory |  20 ++
 ...org.apache.hadoop.security.token.DtFetcher |  17 +
 ...ache.hadoop.security.token.TokenIdentifier |  20 ++
 ....apache.hadoop.security.token.TokenRenewer |  18 +
 12 files changed, 463 insertions(+), 38 deletions(-)
 rename hadoop/{stable-base => stable}/src/main/resources/common-version-info.properties (100%)
 create mode 100644 hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory
 create mode 100644 hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
 create mode 100644 hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec
 create mode 100644 hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.io.erasurecode.rawcoder.RawErasureCoderFactory
 create mode 100644 hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
 create mode 100644 hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.alias.CredentialProviderFactory
 create mode 100644 hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.DtFetcher
 create mode 100644 hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
 create mode 100644 hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer

diff --git a/hadoop/stable-base/pom.xml b/hadoop/stable-base/pom.xml
index f686ab4..18d0df7 100644
--- a/hadoop/stable-base/pom.xml
+++ b/hadoop/stable-base/pom.xml
@@ -217,13 +217,6 @@
       </extension>
     </extensions>
 
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-
     <plugins>
       <plugin>
         <groupId>io.github.git-commit-id</groupId>
diff --git a/hadoop/stable/pom.xml b/hadoop/stable/pom.xml
index 0d35c4e..793321c 100644
--- a/hadoop/stable/pom.xml
+++ b/hadoop/stable/pom.xml
@@ -87,6 +87,7 @@
     <wildfly-openssl.version>2.2.5.Final</wildfly-openssl.version>
     <jsp-api.version>4.0.0</jsp-api.version>
     <jersey.version>3.1.9</jersey.version>
+    <dropwizard.metrics.version>4.2.28</dropwizard.metrics.version>
 
     <hadoop.common.build.dir>${project.build.directory}</hadoop.common.build.dir>
     <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
@@ -112,6 +113,11 @@
       </dependency>
 
       <!-- commons dependencies -->
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>1.9.4</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-configuration2</artifactId>
@@ -123,6 +129,11 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <dependency>
+        <groupId>commons-daemon</groupId>
+        <artifactId>commons-daemon</artifactId>
+        <version>1.4.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
@@ -143,13 +154,13 @@
         <artifactId>commons-math3</artifactId>
         <version>3.6.1</version>
       </dependency>
-      <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils</artifactId>
-        <version>1.9.4</version>
-      </dependency>
 
       <!-- logging dependencies -->
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>jul-to-slf4j</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
@@ -172,6 +183,11 @@
         <artifactId>jetty-util</artifactId>
         <version>${jetty.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-util-ajax</artifactId>
+        <version>${jetty.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.ee10</groupId>
         <artifactId>jetty-ee10-webapp</artifactId>
@@ -207,6 +223,11 @@
         <artifactId>httpcore5</artifactId>
         <version>${httpcomponents.core.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.httpcomponents.client5</groupId>
+        <artifactId>httpclient5</artifactId>
+        <version>${httpcomponents.client.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.nimbusds</groupId>
         <artifactId>nimbus-jose-jwt</artifactId>
@@ -217,6 +238,17 @@
         <artifactId>gson</artifactId>
         <version>2.11.0</version>
       </dependency>
+      <dependency>
+        <groupId>jakarta.xml.bind</groupId>
+        <artifactId>jakarta.xml.bind-api</artifactId>
+        <version>4.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.sun.xml.bind</groupId>
+        <artifactId>jaxb-impl</artifactId>
+        <version>4.0.5</version>
+        <scope>runtime</scope>
+      </dependency>
 
       <!-- Updated to minimal ZooKeeper -->
       <dependency>
@@ -264,7 +296,12 @@
       <dependency>
         <groupId>io.dropwizard.metrics</groupId>
         <artifactId>metrics-core</artifactId>
-        <version>4.2.28</version>
+        <version>${dropwizard.metrics.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>io.dropwizard.metrics</groupId>
+        <artifactId>metrics-jmx</artifactId>
+        <version>${dropwizard.metrics.version}</version>
       </dependency>
 
       <!-- security dependencies -->
@@ -325,6 +362,11 @@
         <artifactId>lz4-java</artifactId>
         <version>1.8.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.fusesource.leveldbjni</groupId>
+        <artifactId>leveldbjni-all</artifactId>
+        <version>1.8</version>
+      </dependency>
 
       <!-- test dependencies -->
       <dependency>
@@ -333,24 +375,18 @@
         <version>1.10.15</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents.client5</groupId>
-        <artifactId>httpclient5</artifactId>
-        <version>${httpcomponents.client.version}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty</groupId>
-        <artifactId>jetty-util-ajax</artifactId>
-        <version>${jetty.version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>com.squareup.okhttp3</groupId>
         <artifactId>mockwebserver3-junit5</artifactId>
         <version>5.0.0-alpha.14</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.mock-server</groupId>
+        <artifactId>mockserver-netty</artifactId>
+        <version>5.15.0</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-stdlib-jdk8</artifactId>
@@ -503,12 +539,36 @@
         <version>${mockito.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-junit</artifactId>
+        <version>2.0.0.0</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
         <version>3.26.3</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.jettison</groupId>
+        <artifactId>jettison</artifactId>
+        <version>1.5.4</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>2.6</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>net.jcip</groupId>
+        <artifactId>jcip-annotations</artifactId>
+        <version>1.0</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -561,6 +621,10 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>commons-daemon</groupId>
+      <artifactId>commons-daemon</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -575,6 +639,10 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
@@ -597,6 +665,10 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-util-ajax</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.ee10</groupId>
       <artifactId>jetty-ee10-servlet</artifactId>
@@ -632,6 +704,10 @@
       <groupId>org.apache.httpcomponents.core5</groupId>
       <artifactId>httpcore5</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.nimbusds</groupId>
       <artifactId>nimbus-jose-jwt</artifactId>
@@ -644,6 +720,15 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <scope>runtime</scope>
+    </dependency>
 
     <!-- netty dependencies -->
     <dependency>
@@ -654,6 +739,10 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-transport-native-epoll</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-http</artifactId>
+    </dependency>
 
     <!-- Updated to mishmash io minimal ZooKeeper -->
     <dependency>
@@ -674,6 +763,10 @@
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.dropwizard.metrics</groupId>
+      <artifactId>metrics-jmx</artifactId>
+    </dependency>
 
     <!-- security dependencies -->
     <dependency>
@@ -740,6 +833,10 @@
       <artifactId>lz4-java</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.fusesource.leveldbjni</groupId>
+      <artifactId>leveldbjni-all</artifactId>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -762,18 +859,13 @@
       <artifactId>mockwebserver3-junit5</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk8</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents.client5</groupId>
-      <artifactId>httpclient5</artifactId>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-netty</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util-ajax</artifactId>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -888,11 +980,31 @@
       <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-junit</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -904,6 +1016,13 @@
       </extension>
     </extensions>
 
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+
     <plugins>
       <!-- download original hadoop source code and mishmash io patches for it -->
       <plugin>
@@ -976,6 +1095,44 @@
                 <replace token="org.apache.hadoop.thirdparty.com.google.common" value="com.google.common" dir="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}">
                   <include name="**/*.java"/>
                 </replace>
+                <replace token="GeneratedMessageV3" value="GeneratedMessage" dir="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/java">
+                  <include name="**/FSImageFormatProtobuf.java"/>
+                </replace>
+              </target>
+            </configuration>
+          </execution>
+          <execution>
+            <id>create-web-xmls</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <copy file="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-web.xml"
+                      tofile="${project.build.directory}/hdfs-webapps/webapps/hdfs/WEB-INF/web.xml"
+                      filtering="true"/>
+                <copy file="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-web.xml"
+                      tofile="${project.build.directory}/hdfs-webapps/webapps/secondary/WEB-INF/web.xml"
+                      filtering="true"/>
+                <copy file="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-web.xml"
+                      tofile="${project.build.directory}/hdfs-webapps/webapps/datanode/WEB-INF/web.xml"
+                      filtering="true"/>
+                <copy file="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-web.xml"
+                      tofile="${project.build.directory}/hdfs-webapps/webapps/journal/WEB-INF/web.xml"
+                      filtering="true"/>
+                <copy file="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/proto-web.xml"
+                      tofile="${project.build.directory}/hdfs-webapps/webapps/nfs3/WEB-INF/web.xml"
+                      filtering="true"/>
+                <copy toDir="${project.build.directory}/hdfs-webapps/webapps">
+                  <fileset dir="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps">
+                    <exclude name="**/proto-web.xml"/>
+                  </fileset>
+                </copy>
+                <replace dir="${project.build.directory}/hdfs-webapps/webapps" value="${release-year}">
+                  <include name="**/*.html"/>
+                  <replacetoken>{release-year-token}</replacetoken>
+                </replace>
               </target>
             </configuration>
           </execution>
@@ -1021,6 +1178,12 @@
                 <source>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-auth/src/main/java</source>
                 <!-- hadoop common -->
                 <source>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/java</source>
+                <!-- hadoop kms -->
+                <source>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-kms/src/main/java</source>
+                <!-- hdfs client -->
+                <source>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java</source>
+                <!-- hdfs -->
+                <source>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/java</source>
               </sources>
             </configuration>
           </execution>
@@ -1032,7 +1195,9 @@
             </goals>
             <configuration>
               <sources>
-                <source>${project.build.directory}/generated-sources/protobuf/java</source>
+                <source>${project.build.directory}/generated-sources/protobuf-common/java</source>
+                <source>${project.build.directory}/generated-sources/protobuf-hdfs-client/java</source>
+                <source>${project.build.directory}/generated-sources/protobuf-hdfs/java</source>
               </sources>
             </configuration>
           </execution>
@@ -1051,6 +1216,12 @@
                 <source>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-auth/src/test/java</source>
                 <!-- hadoop-common -->
                 <source>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/test/java</source>
+                <!-- hadoop-kms -->
+                <source>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-kms/src/test/java</source>
+                <!-- hdfs client -->
+                <source>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java</source>
+                <!-- hdfs -->
+                <source>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/test/java</source>
               </sources>
             </configuration>
           </execution>
@@ -1066,6 +1237,20 @@
               </sources>
             </configuration>
           </execution>
+          <execution>
+            <id>add-resources</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>add-resource</goal>
+            </goals>
+            <configuration>
+              <resources>
+                <resource>
+                  <directory>${project.build.directory}/hdfs-webapps</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
           <execution>
             <id>add-test-resources</id>
             <phase>generate-test-resources</phase>
@@ -1076,10 +1261,36 @@
               <resources>
                 <resource>
                   <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/test/resources</directory>
+                  <excludes>
+                    <exclude>**/META-INF/services/**</exclude>
+                  </excludes>
                 </resource>
                 <!-- also use the default resources provided in src/main of hadoop-common -->
                 <resource>
                   <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/resources</directory>
+                  <excludes>
+                    <exclude>**/common-version-info.properties</exclude>
+                    <exclude>**/META-INF/services/**</exclude>
+                  </excludes>
+                </resource>
+                <resource>
+                  <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-kms/src/main/resources</directory>
+                </resource>
+                <resource>
+                  <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-kms/src/test/resources</directory>
+                  <includes>
+                    **/mini-kms-acls-default.xml,
+                    **/log4j2-kmsaudit.properties
+                  </includes>
+                  <excludes>
+                    **/log4j2.properties
+                  </excludes>
+                </resource>
+                <resource>
+                  <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/test/resources</directory>
+                  <excludes>
+                    <exclude>**/META-INF/services/**</exclude>
+                  </excludes>
                 </resource>
               </resources>
             </configuration>
@@ -1094,18 +1305,46 @@
           <protocArtifact>
             com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
           </protocArtifact>
-          <!--pluginId>grpc-java</pluginId-->
         </configuration>
         <executions>
           <execution>
-            <id>compile-protobuf</id>
+            <id>compile-common-protobuf</id>
             <phase>generate-sources</phase>
             <configuration>
               <protoSourceRoot>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/proto</protoSourceRoot>
               <excludes>
                 <exclude>ProtobufRpcEngine.proto</exclude>
               </excludes>
-              <outputDirectory>${project.build.directory}/generated-sources/protobuf/java</outputDirectory>
+              <outputDirectory>${project.build.directory}/generated-sources/protobuf-common/java</outputDirectory>
+            </configuration>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>compile-hdfs-client-protobuf</id>
+            <phase>generate-sources</phase>
+            <configuration>
+              <protoSourceRoot>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto</protoSourceRoot>
+              <additionalProtoPathElements>
+                <additionalProtoPathElement>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/proto</additionalProtoPathElement>
+              </additionalProtoPathElements>
+              <outputDirectory>${project.build.directory}/generated-sources/protobuf-hdfs-client/java</outputDirectory>
+            </configuration>
+            <goals>
+              <goal>compile</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>compile-hdfs-protobuf</id>
+            <phase>generate-sources</phase>
+            <configuration>
+              <protoSourceRoot>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/proto</protoSourceRoot>
+              <additionalProtoPathElements>
+                <additionalProtoPathElement>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/proto</additionalProtoPathElement>
+                <additionalProtoPathElement>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs-client/src/main/proto</additionalProtoPathElement>
+              </additionalProtoPathElements>
+              <outputDirectory>${project.build.directory}/generated-sources/protobuf-hdfs/java</outputDirectory>
             </configuration>
             <goals>
               <goal>compile</goal>
@@ -1151,6 +1390,25 @@
             <exclude>**/hadoop/security/authentication/server/package-info.java</exclude>
           </excludes>
         </configuration>
+        <executions>
+          <execution>
+            <id>default-testCompile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+            <configuration>
+              <!--
+                exclude the following test, because it uses a way
+                of tapping (mocking really) the built-in DNS client,
+                a way that is no longer available since java 8.
+              -->
+              <testExcludes>
+                <exclude>**/hadoop/hdfs/TestDFSClientFailover.java</exclude>
+              </testExcludes>
+            </configuration>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/hadoop/stable-base/src/main/resources/common-version-info.properties b/hadoop/stable/src/main/resources/common-version-info.properties
similarity index 100%
rename from hadoop/stable-base/src/main/resources/common-version-info.properties
rename to hadoop/stable/src/main/resources/common-version-info.properties
diff --git a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory
new file mode 100644
index 0000000..eab71c7
--- /dev/null
+++ b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory
@@ -0,0 +1,23 @@
+# 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.
+
+org.apache.hadoop.crypto.key.JavaKeyStoreProvider$Factory
+org.apache.hadoop.crypto.key.UserProvider$Factory
+org.apache.hadoop.crypto.key.kms.KMSClientProvider$Factory
+org.apache.hadoop.hdfs.TestKeyProviderCache$Factory
+org.apache.hadoop.crypto.key.JavaKeyStoreProvider$Factory
+org.apache.hadoop.crypto.key.UserProvider$Factory
+org.apache.hadoop.crypto.key.kms.KMSClientProvider$Factory
+org.apache.hadoop.crypto.key.FailureInjectingJavaKeyStoreProvider$Factory
diff --git a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
new file mode 100644
index 0000000..ee80488
--- /dev/null
+++ b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.fs.FileSystem
@@ -0,0 +1,23 @@
+# 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.
+
+org.apache.hadoop.fs.LocalFileSystem
+org.apache.hadoop.fs.viewfs.ViewFileSystem
+org.apache.hadoop.fs.HarFileSystem
+org.apache.hadoop.fs.http.HttpFileSystem
+org.apache.hadoop.fs.http.HttpsFileSystem
+org.apache.hadoop.hdfs.DistributedFileSystem
+org.apache.hadoop.hdfs.web.WebHdfsFileSystem
+org.apache.hadoop.hdfs.web.SWebHdfsFileSystem
diff --git a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec
new file mode 100644
index 0000000..99b6fb2
--- /dev/null
+++ b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.io.compress.CompressionCodec
@@ -0,0 +1,21 @@
+#
+#   Licensed 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.
+#
+org.apache.hadoop.io.compress.BZip2Codec
+org.apache.hadoop.io.compress.DefaultCodec
+org.apache.hadoop.io.compress.DeflateCodec
+org.apache.hadoop.io.compress.GzipCodec
+org.apache.hadoop.io.compress.Lz4Codec
+org.apache.hadoop.io.compress.SnappyCodec
+org.apache.hadoop.io.compress.ZStandardCodec
+
diff --git a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.io.erasurecode.rawcoder.RawErasureCoderFactory b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.io.erasurecode.rawcoder.RawErasureCoderFactory
new file mode 100644
index 0000000..23b1a14
--- /dev/null
+++ b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.io.erasurecode.rawcoder.RawErasureCoderFactory
@@ -0,0 +1,18 @@
+#
+#   Licensed 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.
+#
+org.apache.hadoop.io.erasurecode.rawcoder.NativeRSRawErasureCoderFactory
+org.apache.hadoop.io.erasurecode.rawcoder.NativeXORRawErasureCoderFactory
+org.apache.hadoop.io.erasurecode.rawcoder.RSRawErasureCoderFactory
+org.apache.hadoop.io.erasurecode.rawcoder.RSLegacyRawErasureCoderFactory
+org.apache.hadoop.io.erasurecode.rawcoder.XORRawErasureCoderFactory
diff --git a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
new file mode 100644
index 0000000..f7f3ec2
--- /dev/null
+++ b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.SecurityInfo
@@ -0,0 +1,14 @@
+#
+#   Licensed 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.
+#
+org.apache.hadoop.security.AnnotatedSecurityInfo
diff --git a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.alias.CredentialProviderFactory b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.alias.CredentialProviderFactory
new file mode 100644
index 0000000..1c6fc74
--- /dev/null
+++ b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.alias.CredentialProviderFactory
@@ -0,0 +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.
+
+org.apache.hadoop.security.alias.JavaKeyStoreProvider$Factory
+org.apache.hadoop.security.alias.LocalJavaKeyStoreProvider$Factory
+org.apache.hadoop.security.alias.UserProvider$Factory
+org.apache.hadoop.security.alias.BouncyCastleFipsKeyStoreProvider$Factory
+org.apache.hadoop.security.alias.LocalBouncyCastleFipsKeyStoreProvider$Factory
diff --git a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.DtFetcher b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.DtFetcher
new file mode 100644
index 0000000..5b016e0
--- /dev/null
+++ b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.DtFetcher
@@ -0,0 +1,17 @@
+#
+#   Licensed 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.
+#
+org.apache.hadoop.security.token.TestDtFetcher
+org.apache.hadoop.hdfs.HdfsDtFetcher
+org.apache.hadoop.hdfs.WebHdfsDtFetcher
+org.apache.hadoop.hdfs.SWebHdfsDtFetcher
diff --git a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
new file mode 100644
index 0000000..cb11652
--- /dev/null
+++ b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.TokenIdentifier
@@ -0,0 +1,20 @@
+#
+#   Licensed 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.
+#
+org.apache.hadoop.crypto.key.kms.KMSDelegationToken$KMSDelegationTokenIdentifier
+org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier
+org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier
+org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier$WebHdfsDelegationTokenIdentifier
+org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier$SWebHdfsDelegationTokenIdentifier
+org.apache.hadoop.ipc.TestRpcBase$TestTokenIdentifier
+org.apache.hadoop.security.token.delegation.TestDelegationToken$TestDelegationTokenIdentifier
diff --git a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer
new file mode 100644
index 0000000..7e079f7
--- /dev/null
+++ b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.security.token.TokenRenewer
@@ -0,0 +1,18 @@
+#
+#   Licensed 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.
+#
+org.apache.hadoop.crypto.key.kms.KMSClientProvider$KMSTokenRenewer
+org.apache.hadoop.hdfs.DFSClient$Renewer
+org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier$Renewer
+org.apache.hadoop.hdfs.web.TokenAspect$TokenManager
+org.apache.hadoop.tools.FakeRenewer

From a8dcddec104800769ffb2a39697fa4174d1d78f8 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Wed, 4 Dec 2024 13:42:12 +0200
Subject: [PATCH 02/29] Configure hdfs tests

---
 hadoop/stable-base/pom.xml |  4 ----
 hadoop/stable/pom.xml      | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/hadoop/stable-base/pom.xml b/hadoop/stable-base/pom.xml
index 18d0df7..5b2eac3 100644
--- a/hadoop/stable-base/pom.xml
+++ b/hadoop/stable-base/pom.xml
@@ -218,10 +218,6 @@
     </extensions>
 
     <plugins>
-      <plugin>
-        <groupId>io.github.git-commit-id</groupId>
-        <artifactId>git-commit-id-maven-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
diff --git a/hadoop/stable/pom.xml b/hadoop/stable/pom.xml
index 793321c..4b817ee 100644
--- a/hadoop/stable/pom.xml
+++ b/hadoop/stable/pom.xml
@@ -1024,6 +1024,10 @@
     </resources>
 
     <plugins>
+      <plugin>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
+      </plugin>
       <!-- download original hadoop source code and mishmash io patches for it -->
       <plugin>
         <groupId>com.googlecode.maven-download-plugin</groupId>
@@ -1248,6 +1252,15 @@
                 <resource>
                   <directory>${project.build.directory}/hdfs-webapps</directory>
                 </resource>
+                <resource>
+                  <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/resources</directory>
+                  <includes>
+                    <include>**/hdfs-default.xml</include>
+                  </includes>
+                  <excludes>
+                    <exclude>**/META-INF/**</exclude>
+                  </excludes>
+                </resource>
               </resources>
             </configuration>
           </execution>
@@ -1418,6 +1431,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <forkCount>0.8C</forkCount>
           <reuseForks>false</reuseForks>
           <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs ${test.instrumentation.opts}</argLine>
           <environmentVariables>
@@ -1452,6 +1466,12 @@
             <java.security.egd>${java.security.egd}</java.security.egd>
             <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
           </systemPropertyVariables>
+          <properties>
+            <!-- set a default timeout of 10 minutes to all tests -->
+            <configurationParameters>
+              junit.jupiter.execution.timeout.default = 10m
+            </configurationParameters>
+          </properties>
           <!-- some tests require access to, for example src/main/webapps/static (of hadoop-common), run tests in the hadoop-common directory -->
           <workingDirectory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common</workingDirectory>
           <includes>

From 883b5fb2db170ff4fdf412b5ab5c0d78f858c1af Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 6 Dec 2024 13:07:32 +0200
Subject: [PATCH 03/29] Reconfigure hadoop resources

---
 hadoop/stable/pom.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/hadoop/stable/pom.xml b/hadoop/stable/pom.xml
index 4023f37..5f8f9b4 100644
--- a/hadoop/stable/pom.xml
+++ b/hadoop/stable/pom.xml
@@ -1249,6 +1249,13 @@
             </goals>
             <configuration>
               <resources>
+                <resource>
+                  <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/resources</directory>
+                  <excludes>
+                    <exclude>**/common-version-info.properties</exclude>
+                    <exclude>**/META-INF/services/**</exclude>
+                  </excludes>
+                </resource>
                 <resource>
                   <directory>${project.build.directory}/hdfs-webapps</directory>
                 </resource>
@@ -1278,14 +1285,6 @@
                     <exclude>**/META-INF/services/**</exclude>
                   </excludes>
                 </resource>
-                <!-- also use the default resources provided in src/main of hadoop-common -->
-                <resource>
-                  <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/main/resources</directory>
-                  <excludes>
-                    <exclude>**/common-version-info.properties</exclude>
-                    <exclude>**/META-INF/services/**</exclude>
-                  </excludes>
-                </resource>
                 <resource>
                   <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-kms/src/main/resources</directory>
                 </resource>
@@ -1431,7 +1430,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkCount>0.8C</forkCount>
+          <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
           <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs ${test.instrumentation.opts}</argLine>
           <environmentVariables>

From 29cf02888ef6896f2cca85f1ba4bc52ef2bd2e5e Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Mon, 9 Dec 2024 09:54:12 +0200
Subject: [PATCH 04/29] add KMS resources

---
 hadoop/stable/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/hadoop/stable/pom.xml b/hadoop/stable/pom.xml
index 5f8f9b4..556744e 100644
--- a/hadoop/stable/pom.xml
+++ b/hadoop/stable/pom.xml
@@ -1259,6 +1259,14 @@
                 <resource>
                   <directory>${project.build.directory}/hdfs-webapps</directory>
                 </resource>
+                <resource>
+                  <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-kms/src/main/resources</directory>
+                  <includes>
+                    <include>**/kms-default.xml</include>
+                    <!-- drop webapps/static -->
+                    <include>**/webapps/kms/**</include>
+                  </includes>
+                </resource>
                 <resource>
                   <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/main/resources</directory>
                   <includes>

From 4f80c1c861c382af0f1bd2ccd672571fda5875eb Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Wed, 11 Dec 2024 20:01:42 +0200
Subject: [PATCH 05/29] Upgrade build/jaxb

---
 hadoop/stable/pom.xml                         |  27 +++--
 .../src/test/resources/log4j2.properties      | 112 ++++++++++++++++++
 2 files changed, 128 insertions(+), 11 deletions(-)
 create mode 100644 hadoop/stable/src/test/resources/log4j2.properties

diff --git a/hadoop/stable/pom.xml b/hadoop/stable/pom.xml
index 444bc3a..98bc2eb 100644
--- a/hadoop/stable/pom.xml
+++ b/hadoop/stable/pom.xml
@@ -243,12 +243,6 @@
         <artifactId>jakarta.xml.bind-api</artifactId>
         <version>4.0.0</version>
       </dependency>
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <version>4.0.5</version>
-        <scope>runtime</scope>
-      </dependency>
 
       <!-- Updated to minimal ZooKeeper -->
       <dependency>
@@ -725,8 +719,9 @@
       <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.sun.xml.bind</groupId>
-      <artifactId>jaxb-impl</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>4.0.5</version>
       <scope>runtime</scope>
     </dependency>
 
@@ -837,6 +832,12 @@
       <groupId>org.fusesource.leveldbjni</groupId>
       <artifactId>leveldbjni-all</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>
@@ -1290,7 +1291,10 @@
                 <resource>
                   <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/test/resources</directory>
                   <excludes>
-                    <exclude>**/META-INF/services/**</exclude>
+                    **/META-INF/services/**,
+                    **/log4j2.properties,
+                    **/krb5.conf,
+                    **/hadoop-policy.xml
                   </excludes>
                 </resource>
                 <resource>
@@ -1309,7 +1313,8 @@
                 <resource>
                   <directory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-hdfs-project/hadoop-hdfs/src/test/resources</directory>
                   <excludes>
-                    <exclude>**/META-INF/services/**</exclude>
+                    **/META-INF/services/**,
+                    **/log4j*.properties
                   </excludes>
                 </resource>
               </resources>
@@ -1440,7 +1445,7 @@
         <configuration>
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
-          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs ${test.instrumentation.opts}</argLine>
+          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ${test.instrumentation.opts}</argLine>
           <environmentVariables>
             <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME>
             <!-- HADOOP_HOME required for tests on Windows to find winutils -->
diff --git a/hadoop/stable/src/test/resources/log4j2.properties b/hadoop/stable/src/test/resources/log4j2.properties
new file mode 100644
index 0000000..d1b2d77
--- /dev/null
+++ b/hadoop/stable/src/test/resources/log4j2.properties
@@ -0,0 +1,112 @@
+#
+#   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.
+#
+# log4j configuration used during build and unit tests
+# combines settings for multiple modules
+
+rootLogger = INFO, STDOUT
+appender.console.threshold.type=ThresholdFilter
+appender.console.threshold.level=ALL
+appender.console.name = STDOUT
+appender.console.type = Console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c{2} (%F:%M(%L)) - %m%n
+
+logger.bindingutils.name = org.apache.hadoop.util.dynamic.BindingUtils
+logger.bindingutils.level = DEBUG
+
+#
+# NameNode metrics logging.
+# The default is to retain two namenode-metrics.log files up to 64MB each.
+#
+
+appender.nnmetrics.type = RollingRandomAccessFile
+appender.nnmetrics.name = NameNodeMetricsLogAppender
+appender.nnmetrics.layout.type = PatternLayout
+appender.nnmetrics.layout.pattern = %d{ISO8601} %m%n
+appender.nnmetrics.fileName = ${hadoop.log.dir}/namenode-metrics.log
+appender.nnmetrics.filePattern = ${hadoop.log.dir}/namenode-metrics.log.$i.gz
+appender.nnmetrics.immediateFlush = false
+appender.nnmetrics.policies.type = Policies
+appender.nnmetrics.policies.size.type = SizeBasedTriggeringPolicy
+appender.nnmetrics.policies.size.size = 64MB
+appender.nnmetrics.strategy.type = DefaultRolloverStrategy
+appender.nnmetrics.strategy.max = 1
+
+logger.nnmetrics.type = AsyncLogger
+logger.nnmetrics.name = NameNodeMetricsLog
+logger.nnmetrics.level = INFO
+logger.nnmetrics.additivity = false
+logger.nnmetrics.appenderRef.console.ref = STDOUT
+logger.nnmetrics.appenderRef.rolling.ref = NameNodeMetricsLogAppender
+
+#
+# DataNode metrics logging.
+# The default is to retain two datanode-metrics.log files up to 64MB each.
+#
+
+appender.dnmetrics.type = RollingRandomAccessFile
+appender.dnmetrics.name = DataNodeMetricsLogAppender
+appender.dnmetrics.layout.type = PatternLayout
+appender.dnmetrics.layout.pattern = %d{ISO8601} %m%n
+appender.dnmetrics.fileName = ${hadoop.log.dir}/datanode-metrics.log
+appender.dnmetrics.filePattern = ${hadoop.log.dir}/datanode-metrics.log.$i.gz
+appender.dnmetrics.immediateFlush = false
+appender.dnmetrics.policies.type = Policies
+appender.dnmetrics.policies.size.type = SizeBasedTriggeringPolicy
+appender.dnmetrics.policies.size.size = 64MB
+appender.dnmetrics.strategy.type = DefaultRolloverStrategy
+appender.dnmetrics.strategy.max = 1
+
+logger.dnmetrics.type = AsyncLogger
+logger.dnmetrics.name = DataNodeMetricsLog
+logger.dnmetrics.level = INFO
+logger.dnmetrics.additivity = false
+logger.dnmetrics.appenderRef.console.ref = STDOUT
+logger.dnmetrics.appenderRef.rolling.ref = DataNodeMetricsLogAppender
+
+
+# Supress KMS error log
+logger.kmswadl.name = org.glassfish.jersey.server.wadl.internal.generators.WadlGeneratorJAXBGrammarGenerator
+logger.kmswadl.level = OFF
+
+#
+# hdfs audit logging
+#
+
+property.hdfs.audit.log.maxfilesize = 256MB
+property.hdfs.audit.log.maxbackupindex = 20
+
+appender.hdfsaudit.type = RollingRandomAccessFile
+appender.hdfsaudit.name = HdfsAuditLogAppender
+appender.hdfsaudit.layout.type = PatternLayout
+appender.hdfsaudit.layout.pattern = %m%n
+appender.hdfsaudit.fileName = ${hadoop.log.dir}/hdfs-audit.log
+appender.hdfsaudit.filePattern = ${hadoop.log.dir}/hdfs-audit.log.$i.gz
+appender.hdfsaudit.bufferSize = 256
+appender.hdfsaudit.immediateFlush = false
+appender.hdfsaudit.policies.type = Policies
+appender.hdfsaudit.policies.size.type = SizeBasedTriggeringPolicy
+appender.hdfsaudit.policies.size.size = ${hdfs.audit.log.maxfilesize}
+appender.hdfsaudit.strategy.type = DefaultRolloverStrategy
+appender.hdfsaudit.strategy.max = ${hdfs.audit.log.maxbackupindex}
+
+logger.hdfsaudit.type = AsyncLogger
+logger.hdfsaudit.name = org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit
+logger.hdfsaudit.level = INFO
+logger.hdfsaudit.additivity = false
+logger.hdfsaudit.appenderRef.console.ref = STDOUT
+logger.hdfsaudit.appenderRef.rolling.ref = HdfsAuditLogAppender

From 4972f8320547dd80db263b64b4b6be0e68aee08b Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Thu, 12 Dec 2024 14:10:10 +0200
Subject: [PATCH 06/29] Fix async log files dir

---
 .../src/test/resources/log4j2.properties      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/hadoop/stable/src/test/resources/log4j2.properties b/hadoop/stable/src/test/resources/log4j2.properties
index d1b2d77..74fbe0b 100644
--- a/hadoop/stable/src/test/resources/log4j2.properties
+++ b/hadoop/stable/src/test/resources/log4j2.properties
@@ -17,6 +17,9 @@
 # log4j configuration used during build and unit tests
 # combines settings for multiple modules
 
+# Uncomment to enable log4j2 to also log
+# status = TRACE
+
 rootLogger = INFO, STDOUT
 appender.console.threshold.type=ThresholdFilter
 appender.console.threshold.level=ALL
@@ -37,8 +40,8 @@ appender.nnmetrics.type = RollingRandomAccessFile
 appender.nnmetrics.name = NameNodeMetricsLogAppender
 appender.nnmetrics.layout.type = PatternLayout
 appender.nnmetrics.layout.pattern = %d{ISO8601} %m%n
-appender.nnmetrics.fileName = ${hadoop.log.dir}/namenode-metrics.log
-appender.nnmetrics.filePattern = ${hadoop.log.dir}/namenode-metrics.log.$i.gz
+appender.nnmetrics.fileName = ${sys:hadoop.log.dir}/namenode-metrics.log
+appender.nnmetrics.filePattern = ${sys:hadoop.log.dir}/namenode-metrics.log.$i.gz
 appender.nnmetrics.immediateFlush = false
 appender.nnmetrics.policies.type = Policies
 appender.nnmetrics.policies.size.type = SizeBasedTriggeringPolicy
@@ -62,8 +65,8 @@ appender.dnmetrics.type = RollingRandomAccessFile
 appender.dnmetrics.name = DataNodeMetricsLogAppender
 appender.dnmetrics.layout.type = PatternLayout
 appender.dnmetrics.layout.pattern = %d{ISO8601} %m%n
-appender.dnmetrics.fileName = ${hadoop.log.dir}/datanode-metrics.log
-appender.dnmetrics.filePattern = ${hadoop.log.dir}/datanode-metrics.log.$i.gz
+appender.dnmetrics.fileName = ${sys:hadoop.log.dir}/datanode-metrics.log
+appender.dnmetrics.filePattern = ${sys:hadoop.log.dir}/datanode-metrics.log.$i.gz
 appender.dnmetrics.immediateFlush = false
 appender.dnmetrics.policies.type = Policies
 appender.dnmetrics.policies.size.type = SizeBasedTriggeringPolicy
@@ -87,22 +90,19 @@ logger.kmswadl.level = OFF
 # hdfs audit logging
 #
 
-property.hdfs.audit.log.maxfilesize = 256MB
-property.hdfs.audit.log.maxbackupindex = 20
-
 appender.hdfsaudit.type = RollingRandomAccessFile
 appender.hdfsaudit.name = HdfsAuditLogAppender
 appender.hdfsaudit.layout.type = PatternLayout
 appender.hdfsaudit.layout.pattern = %m%n
-appender.hdfsaudit.fileName = ${hadoop.log.dir}/hdfs-audit.log
-appender.hdfsaudit.filePattern = ${hadoop.log.dir}/hdfs-audit.log.$i.gz
+appender.hdfsaudit.fileName = ${sys:hadoop.log.dir}/hdfs-audit.log
+appender.hdfsaudit.filePattern = ${sys:hadoop.log.dir}/hdfs-audit.log.$i.gz
 appender.hdfsaudit.bufferSize = 256
 appender.hdfsaudit.immediateFlush = false
 appender.hdfsaudit.policies.type = Policies
 appender.hdfsaudit.policies.size.type = SizeBasedTriggeringPolicy
-appender.hdfsaudit.policies.size.size = ${hdfs.audit.log.maxfilesize}
+appender.hdfsaudit.policies.size.size = ${sys:hdfs.audit.log.maxfilesize:-256MB}
 appender.hdfsaudit.strategy.type = DefaultRolloverStrategy
-appender.hdfsaudit.strategy.max = ${hdfs.audit.log.maxbackupindex}
+appender.hdfsaudit.strategy.max = ${sys:hdfs.audit.log.maxbackupindex:-20}
 
 logger.hdfsaudit.type = AsyncLogger
 logger.hdfsaudit.name = org.apache.hadoop.hdfs.server.namenode.FSNamesystem.audit

From afe34018fcfcc56d4d055b150621c135929b2010 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Thu, 19 Dec 2024 15:41:01 +0200
Subject: [PATCH 07/29] First test separation

---
 hadoop/stable/pom.xml                         |  12 +
 ...pache.hadoop.crypto.key.KeyProviderFactory |   3 -
 .../src/test/resources/log4j2.properties      |  17 +-
 tests/coordination/base/pom.xml               | 293 +++++++++++
 tests/storage/block/base/pom.xml              | 475 ++++++++++++++++++
 5 files changed, 795 insertions(+), 5 deletions(-)
 create mode 100644 tests/coordination/base/pom.xml
 create mode 100644 tests/storage/block/base/pom.xml

diff --git a/hadoop/stable/pom.xml b/hadoop/stable/pom.xml
index 98bc2eb..0776dbf 100644
--- a/hadoop/stable/pom.xml
+++ b/hadoop/stable/pom.xml
@@ -157,10 +157,16 @@
 
       <!-- logging dependencies -->
       <dependency>
+        <!-- TODO: remove in favour of log4j2 (used in KMSWebApp.java) -->
         <groupId>org.slf4j</groupId>
         <artifactId>jul-to-slf4j</artifactId>
         <version>${slf4j.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.logging.log4j</groupId>
+        <artifactId>log4j-jul</artifactId>
+        <version>${log4j2.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
@@ -637,6 +643,10 @@
       <groupId>org.slf4j</groupId>
       <artifactId>jul-to-slf4j</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-jul</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
@@ -1477,6 +1487,8 @@
             <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
             <java.security.egd>${java.security.egd}</java.security.egd>
             <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
+
+            <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
           </systemPropertyVariables>
           <properties>
             <!-- set a default timeout of 10 minutes to all tests -->
diff --git a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory
index eab71c7..22109d8 100644
--- a/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory
+++ b/hadoop/stable/src/test/resources/META-INF/services/org.apache.hadoop.crypto.key.KeyProviderFactory
@@ -17,7 +17,4 @@ org.apache.hadoop.crypto.key.JavaKeyStoreProvider$Factory
 org.apache.hadoop.crypto.key.UserProvider$Factory
 org.apache.hadoop.crypto.key.kms.KMSClientProvider$Factory
 org.apache.hadoop.hdfs.TestKeyProviderCache$Factory
-org.apache.hadoop.crypto.key.JavaKeyStoreProvider$Factory
-org.apache.hadoop.crypto.key.UserProvider$Factory
-org.apache.hadoop.crypto.key.kms.KMSClientProvider$Factory
 org.apache.hadoop.crypto.key.FailureInjectingJavaKeyStoreProvider$Factory
diff --git a/hadoop/stable/src/test/resources/log4j2.properties b/hadoop/stable/src/test/resources/log4j2.properties
index 74fbe0b..bcd2316 100644
--- a/hadoop/stable/src/test/resources/log4j2.properties
+++ b/hadoop/stable/src/test/resources/log4j2.properties
@@ -20,7 +20,12 @@
 # Uncomment to enable log4j2 to also log
 # status = TRACE
 
-rootLogger = INFO, STDOUT
+packages=org.apache.hadoop.test
+
+rootLogger.level = INFO
+rootLogger.appenderRef.console.ref=STDOUT
+rootLogger.appenderRef.capture.ref=capture
+
 appender.console.threshold.type=ThresholdFilter
 appender.console.threshold.level=ALL
 appender.console.name = STDOUT
@@ -31,6 +36,12 @@ appender.console.layout.pattern = %d{ISO8601} [%t] %-5p %c{2} (%F:%M(%L)) - %m%n
 logger.bindingutils.name = org.apache.hadoop.util.dynamic.BindingUtils
 logger.bindingutils.level = DEBUG
 
+# used by tests to capture and verify log messages
+appender.capture.name = capture
+appender.capture.type = CapturingAppender
+appender.capture.layout.type = PatternLayout
+appender.capture.layout.pattern = %m%n
+
 #
 # NameNode metrics logging.
 # The default is to retain two namenode-metrics.log files up to 64MB each.
@@ -55,6 +66,7 @@ logger.nnmetrics.level = INFO
 logger.nnmetrics.additivity = false
 logger.nnmetrics.appenderRef.console.ref = STDOUT
 logger.nnmetrics.appenderRef.rolling.ref = NameNodeMetricsLogAppender
+logger.nnmetrics.appenderRef.capture.ref = capture
 
 #
 # DataNode metrics logging.
@@ -80,7 +92,7 @@ logger.dnmetrics.level = INFO
 logger.dnmetrics.additivity = false
 logger.dnmetrics.appenderRef.console.ref = STDOUT
 logger.dnmetrics.appenderRef.rolling.ref = DataNodeMetricsLogAppender
-
+logger.dnmetrics.appenderRef.capture.ref = capture
 
 # Supress KMS error log
 logger.kmswadl.name = org.glassfish.jersey.server.wadl.internal.generators.WadlGeneratorJAXBGrammarGenerator
@@ -110,3 +122,4 @@ logger.hdfsaudit.level = INFO
 logger.hdfsaudit.additivity = false
 logger.hdfsaudit.appenderRef.console.ref = STDOUT
 logger.hdfsaudit.appenderRef.rolling.ref = HdfsAuditLogAppender
+logger.hdfsaudit.appenderRef.capture.ref = capture
diff --git a/tests/coordination/base/pom.xml b/tests/coordination/base/pom.xml
new file mode 100644
index 0000000..4142cb2
--- /dev/null
+++ b/tests/coordination/base/pom.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2024 Mishmash IO UK Ltd.
+
+  Licensed 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.mishmash.test.stacks</groupId>
+  <artifactId>test-coordination-base</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>Modifications and extensions of Apache ZooKeeper, by mishmash io</name>
+  <description>
+    Apache ZooKeeper is a service for coordinating processes of distributed applications.
+
+    This package contains Apache ZooKeeper as modified by mishmash io. For more info on the 
+    specific modifications by mishmash io visit our website and GitHub.
+
+    It is recommended that you don't use this package directly, but rather - one of the 
+    minimal client or server packages.
+  </description>
+  <url>https://mishmash.io/open_source/apache_big_data</url>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>mishmash io</name>
+    <url>https://mishmash.io</url>
+  </organization>
+
+  <scm>
+    <connection>scm:git:https://github.com/mishmash-io/for-apache.git</connection>
+    <developerConnection>scm:git:https://github.com/mishmash-io/for-apache.git</developerConnection>
+    <url>https://github.com/mishmash-io/for-apache</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Ivan Kountchev</name>
+      <email>i.kountchev@mishmash.io</email>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Andrey Rusev</name>
+      <email>a.rusev@mishmash.io</email>
+      <url>www.linkedin.com/in/andrey-rusev-21894172</url>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>architect</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <properties>
+    <zookeeper.version>3.8.3-mmio.2</zookeeper.version>
+    <jmockit.version>1.49</jmockit.version>
+    <top.version>0.0.1</top.version>
+    <test.instrumentation.opts></test.instrumentation.opts>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.mishmash.apache</groupId>
+        <artifactId>mmio-for-apache-parent</artifactId>
+        <version>${top.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.mishmash.apache.zookeeper</groupId>
+        <artifactId>mmio-zookeeper-stable</artifactId>
+        <version>${zookeeper.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  
+  <dependencies>
+    <dependency>
+      <groupId>commons-cli</groupId>
+      <artifactId>commons-cli</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerb-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerb-simplekdc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerby-config</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jmockit</groupId>
+      <artifactId>jmockit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-suite-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-suite-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.burningwave</groupId>
+      <artifactId>tools</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <version>${zookeeper.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <version>${zookeeper.version}</version>
+      <type>test-jar</type>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.zookeeper</groupId>
+                  <artifactId>mmio-zookeeper-stable</artifactId>
+                  <version>${zookeeper.version}</version>
+                  <classifier>tests</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>tbuild-cpu-count</id>
+            <goals>
+              <goal>cpu-count</goal>
+            </goals>
+            <configuration>
+              <cpuCount>surefire-forkcount</cpuCount>
+            </configuration>
+          </execution>
+          <execution>
+            <id>tbuild-hostname</id>
+            <goals>
+              <goal>hostname</goal>
+            </goals>
+            <configuration>
+              <hostnameProperty>tests.hostname</hostnameProperty>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>prepare-filtered-test-resource</id>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <phase>process-test-classes</phase>
+            <configuration>
+              <outputDirectory>${project.build.directory}/generated-test-resources</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${project.build.directory}/test-classes/filtered</directory>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/*Test.java</include>
+          </includes>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <forkCount>${surefire-forkcount}</forkCount>
+          <reuseForks>false</reuseForks>
+          <argLine>-Djdk.net.hosts.file=${project.build.directory}/generated-test-resources/hosts -Xmx512m -Dtest.junit.threads=${surefire-forkcount} -Dzookeeper.junit.threadid=${surefire.forkNumber} -javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar ${test.instrumentation.opts}</argLine>
+          <!--workingDirectory>${project.build.directory}/zookeeper-release-${zookeeper.stable.version}/zookeeper-server</workingDirectory-->
+          <systemPropertyVariables>
+            <build.test.dir>${project.build.directory}/surefire</build.test.dir>
+            <zookeeper.DigestAuthenticationProvider.superDigest>super:D/InIHSb7yEEbrWz8b9l71RjZJU=</zookeeper.DigestAuthenticationProvider.superDigest>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/storage/block/base/pom.xml b/tests/storage/block/base/pom.xml
new file mode 100644
index 0000000..238c18c
--- /dev/null
+++ b/tests/storage/block/base/pom.xml
@@ -0,0 +1,475 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2024 Mishmash IO UK Ltd.
+
+  Licensed 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.mishmash.test.stacks</groupId>
+  <artifactId>test-storage-blocks-base</artifactId>
+  <version>1.0.0</version>
+
+  <name>Modifications and extensions of Apache Hadoop, by mishmash io</name>
+  <description>
+    Apache ZooKeeper is a service for coordinating processes of distributed applications.
+
+    This package contains Apache ZooKeeper as modified by mishmash io. For more info on the 
+    specific modifications visit our website and github.
+
+    It is recommended that you don't use this package directly, but rather - one of the 
+    dependency-reduced client or server packages.
+  </description>
+  <url>https://mishmash.io/open_source/apache_big_data</url>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>mishmash io</name>
+    <url>https://mishmash.io</url>
+  </organization>
+
+  <scm>
+    <connection>scm:git:https://github.com/mishmash-io/for-apache.git</connection>
+    <developerConnection>scm:git:https://github.com/mishmash-io/for-apache.git</developerConnection>
+    <url>https://github.com/mishmash-io/for-apache</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Ivan Kountchev</name>
+      <email>i.kountchev@mishmash.io</email>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Andrey Rusev</name>
+      <email>a.rusev@mishmash.io</email>
+      <url>www.linkedin.com/in/andrey-rusev-21894172</url>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>architect</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <properties>
+    <top.version>0.0.1</top.version>
+    <hadoop.version>3.4.1-mmio.1</hadoop.version>
+
+    <hadoop.common.build.dir>${project.build.directory}</hadoop.common.build.dir>
+    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+    <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
+    <java.security.egd>file:///dev/urandom</java.security.egd>
+    <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
+    <test.build.data>${test.build.dir}</test.build.data>
+    <test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+    <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps>
+
+    <test.instrumentation.opts></test.instrumentation.opts>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.mishmash.apache</groupId>
+        <artifactId>mmio-for-apache-parent</artifactId>
+        <version>${top.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.mishmash.apache.hadoop</groupId>
+        <artifactId>stable</artifactId>
+        <version>${hadoop.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>      
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>4.0.5</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- Updated to mishmash io minimal ZooKeeper -->
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-recipes</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerb-simplekdc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver3-junit5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-codec-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-model</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-integ</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-integ</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-sftp</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-console</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.mishmash.apache.hadoop</groupId>
+      <artifactId>stable</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>    
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.hadoop</groupId>
+      <artifactId>stable</artifactId>
+      <version>${hadoop.version}</version>
+      <type>test-jar</type>
+      <classifier>tests</classifier>
+      <scope>test</scope>    
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>sources</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/workdir/src/main/java</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-tests</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>tests</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>create-log-dir</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                TODO: there are tests (TestLocalFileSystem#testCopy) that fail if data
+                TODO: from a previous run is present
+                -->
+                <delete dir="${test.build.data}"/>
+                <mkdir dir="${test.build.data}"/>
+                <mkdir dir="${hadoop.log.dir}"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ${test.instrumentation.opts}</argLine>
+          <environmentVariables>
+            <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME>
+            <!-- HADOOP_HOME required for tests on Windows to find winutils -->
+            <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
+            <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</LD_LIBRARY_PATH>
+            <DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
+            <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+
+            <!--
+              Disable the servlet instrumentation for now, because the TestAuthenticationFilter
+              uses Mockito.verifyNoMoreInteractions(<HttpServletResponse mocks>), and OpenTelemetry
+              does interact with HttpServletResponse(s).
+
+              Another solution might be to tell Otel to not instrument Mockito mocked classes, if it can recognize them
+            -->
+            <OTEL_INSTRUMENTATION_SERVLET_ENABLED>false</OTEL_INSTRUMENTATION_SERVLET_ENABLED>
+            <OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>false</OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>
+          </environmentVariables>
+          <systemPropertyVariables>
+            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
+            <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
+
+            <test.build.dir>${test.build.dir}</test.build.dir>
+            <test.build.data>${test.build.data}</test.build.data>
+            <test.build.webapps>${test.build.webapps}</test.build.webapps>
+            <test.cache.data>${test.cache.data}</test.cache.data>
+            <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+
+            <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
+            <java.security.egd>${java.security.egd}</java.security.egd>
+            <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
+
+            <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
+          </systemPropertyVariables>
+          <properties>
+            <!-- set a default timeout of 10 minutes to all tests -->
+            <configurationParameters>
+              junit.jupiter.execution.timeout.default = 10m
+            </configurationParameters>
+          </properties>
+          <workingDirectory>${project.build.directory}/workdir</workingDirectory>
+          <includes>
+            <include>**/hadoop/cli/**</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

From ba1c351ffded315f8a95b85566650b20c09bb13c Mon Sep 17 00:00:00 2001
From: Andrey Rusev <a.rusev@mishmash.io>
Date: Thu, 19 Dec 2024 17:12:36 +0200
Subject: [PATCH 08/29] Update build workflow

---
 .github/workflows/maven.yml | 58 ++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e0a7e54..45549b0 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,17 +15,43 @@ on:
     branches: [ "main" ]
 
 jobs:
-  build:
-
+  compile:
+    name: Compile everything
     runs-on: ubuntu-latest
 
-    timeout-minutes: 520
-
     # allow 'Update dependency graph' step below to submit the generated graph
     permissions:
       contents: write
       pull-requests: write
 
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+    - name: Build with Maven
+      run: mvn -DskipTests install --file pom.xml
+    - name: Cache build artifacts
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml', '~/.m2/repository/.cache/**/mishmash_io.patch*') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Update dependency graph
+      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
+      continue-on-error: true
+
+  test:
+    needs: compile
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test-set: ['coordination/base/', 'storage/block/base']
+    name: Testing ${{ test-set }}
+
     services:
       otel-to-parquet:
         image: mishmashio/opentelemetry-parquet-server
@@ -33,7 +59,8 @@ jobs:
           - 4317:4317
           - 4318:4318
         volumes:
-          - /tmp/tests-parquet:/parquet
+          - /tmp/tests-parquet/${{ test-set }}:/parquet
+
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 17
@@ -41,40 +68,43 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
-        cache: maven
     - name: Download latest OpenTelemetry java agent
       run: curl -L -o /tmp/opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
-    - name: Build with Maven
+    - name: Cache build artifacts
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml', '~/.m2/repository/.cache/**/mishmash_io.patch*') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Run test set ${{ test-set }}
       env:
         OTEL_SERVICE_NAME: maven-test-service
         OTEL_EXPORTER_OTLP_PROTOCOL: grpc
         OTEL_EXPORTER_OTLP_ENDPOINT: http://localhost:4317
-      run: mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar --fail-at-end -B package --file pom.xml
+      run: cd tests/${{ tests-set }} && mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar --fail-at-end test --file pom.xml
     - name: Upload telemetry logs
       uses: actions/upload-artifact@v4
       if: always()
       continue-on-error: true
       with:
         name: build-telemetry-logs
-        path: /tmp/tests-parquet/logs-*.parquet
+        path: /tmp/tests-parquet/${{ test-set }}/logs-*.parquet
     - name: Upload telemetry metrics
       uses: actions/upload-artifact@v4
       if: always()
       continue-on-error: true
       with:
         name: build-telemetry-metrics
-        path: /tmp/tests-parquet/metrics-*.parquet
+        path: /tmp/tests-parquet/${{ test-set }}/metrics-*.parquet
     - name: Upload telemetry traces
       uses: actions/upload-artifact@v4
       if: always()
       continue-on-error: true
       with:
         name: build-telemetry-traces
-        path: /tmp/tests-parquet/traces-*.parquet
+        path: /tmp/tests-parquet/${{ test-set }}/traces-*.parquet
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
-    - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
-      continue-on-error: true
 
 #    - name: Publish Test Report
 #      if: success() || failure()

From 77571817496625200e3b96677e99639ae653c862 Mon Sep 17 00:00:00 2001
From: Andrey Rusev <a.rusev@mishmash.io>
Date: Thu, 19 Dec 2024 17:32:47 +0200
Subject: [PATCH 09/29] Fixing build

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 45549b0..8a8d8ad 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -37,7 +37,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml', '~/.m2/repository/.cache/**/mishmash_io.patch*') }}
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ hashFiles('~/.m2/repository/.cache/**/mishmash_io.patch*') }}
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Update dependency graph

From aca3136d0407d3ef73ef4d0a7a9b230a2e075463 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 08:51:42 +0200
Subject: [PATCH 10/29] Rename workflow variable

---
 .github/workflows/maven.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8a8d8ad..b7b2678 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -49,8 +49,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        test-set: ['coordination/base/', 'storage/block/base']
-    name: Testing ${{ test-set }}
+        testset: ['coordination/base/', 'storage/block/base']
+    name: Testing ${{ testset }}
 
     services:
       otel-to-parquet:
@@ -59,7 +59,7 @@ jobs:
           - 4317:4317
           - 4318:4318
         volumes:
-          - /tmp/tests-parquet/${{ test-set }}:/parquet
+          - /tmp/tests-parquet/${{ testset }}:/parquet
 
     steps:
     - uses: actions/checkout@v4
@@ -77,33 +77,33 @@ jobs:
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml', '~/.m2/repository/.cache/**/mishmash_io.patch*') }}
         restore-keys: |
           ${{ runner.os }}-maven-
-    - name: Run test set ${{ test-set }}
+    - name: Run test set ${{ testset }}
       env:
         OTEL_SERVICE_NAME: maven-test-service
         OTEL_EXPORTER_OTLP_PROTOCOL: grpc
         OTEL_EXPORTER_OTLP_ENDPOINT: http://localhost:4317
-      run: cd tests/${{ tests-set }} && mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar --fail-at-end test --file pom.xml
+      run: cd tests/${{ testset }} && mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar --fail-at-end test --file pom.xml
     - name: Upload telemetry logs
       uses: actions/upload-artifact@v4
       if: always()
       continue-on-error: true
       with:
         name: build-telemetry-logs
-        path: /tmp/tests-parquet/${{ test-set }}/logs-*.parquet
+        path: /tmp/tests-parquet/${{ testset }}/logs-*.parquet
     - name: Upload telemetry metrics
       uses: actions/upload-artifact@v4
       if: always()
       continue-on-error: true
       with:
         name: build-telemetry-metrics
-        path: /tmp/tests-parquet/${{ test-set }}/metrics-*.parquet
+        path: /tmp/tests-parquet/${{ testset }}/metrics-*.parquet
     - name: Upload telemetry traces
       uses: actions/upload-artifact@v4
       if: always()
       continue-on-error: true
       with:
         name: build-telemetry-traces
-        path: /tmp/tests-parquet/${{ test-set }}/traces-*.parquet
+        path: /tmp/tests-parquet/${{ testset }}/traces-*.parquet
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
 
 #    - name: Publish Test Report

From c85364179cbc69c1864f4b43ba4a48f34efa3782 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 08:54:53 +0200
Subject: [PATCH 11/29] Refactor workflow

---
 .github/workflows/maven.yml | 120 ++++++++++++++++++------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b7b2678..88681f8 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -44,66 +44,66 @@ jobs:
       uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
       continue-on-error: true
 
-  test:
-    needs: compile
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        testset: ['coordination/base/', 'storage/block/base']
-    name: Testing ${{ testset }}
-
-    services:
-      otel-to-parquet:
-        image: mishmashio/opentelemetry-parquet-server
-        ports:
-          - 4317:4317
-          - 4318:4318
-        volumes:
-          - /tmp/tests-parquet/${{ testset }}:/parquet
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v3
-      with:
-        java-version: '17'
-        distribution: 'temurin'
-    - name: Download latest OpenTelemetry java agent
-      run: curl -L -o /tmp/opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
-    - name: Cache build artifacts
-      uses: actions/cache@v3
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml', '~/.m2/repository/.cache/**/mishmash_io.patch*') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
-    - name: Run test set ${{ testset }}
-      env:
-        OTEL_SERVICE_NAME: maven-test-service
-        OTEL_EXPORTER_OTLP_PROTOCOL: grpc
-        OTEL_EXPORTER_OTLP_ENDPOINT: http://localhost:4317
-      run: cd tests/${{ testset }} && mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar --fail-at-end test --file pom.xml
-    - name: Upload telemetry logs
-      uses: actions/upload-artifact@v4
-      if: always()
-      continue-on-error: true
-      with:
-        name: build-telemetry-logs
-        path: /tmp/tests-parquet/${{ testset }}/logs-*.parquet
-    - name: Upload telemetry metrics
-      uses: actions/upload-artifact@v4
-      if: always()
-      continue-on-error: true
-      with:
-        name: build-telemetry-metrics
-        path: /tmp/tests-parquet/${{ testset }}/metrics-*.parquet
-    - name: Upload telemetry traces
-      uses: actions/upload-artifact@v4
-      if: always()
-      continue-on-error: true
-      with:
-        name: build-telemetry-traces
-        path: /tmp/tests-parquet/${{ testset }}/traces-*.parquet
+#  test:
+#    needs: compile
+#    runs-on: ubuntu-latest
+#    strategy:
+#      matrix:
+#        testset: ['coordination/base/', 'storage/block/base']
+#    name: Testing ${{ testset }}
+#
+#    services:
+#      otel-to-parquet:
+#        image: mishmashio/opentelemetry-parquet-server
+#        ports:
+#          - 4317:4317
+#          - 4318:4318
+#        volumes:
+#          - /tmp/tests-parquet/${{ testset }}:/parquet
+#
+#    steps:
+#    - uses: actions/checkout@v4
+#    - name: Set up JDK 17
+#      uses: actions/setup-java@v3
+#      with:
+#        java-version: '17'
+#        distribution: 'temurin'
+#    - name: Download latest OpenTelemetry java agent
+#      run: curl -L -o /tmp/opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
+#    - name: Cache build artifacts
+#      uses: actions/cache@v3
+#      with:
+#        path: ~/.m2/repository
+#        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml', '~/.m2/repository/.cache/**/mishmash_io.patch*') }}
+#        restore-keys: |
+#          ${{ runner.os }}-maven-
+#    - name: Run test set ${{ testset }}
+#      env:
+#        OTEL_SERVICE_NAME: maven-test-service
+#        OTEL_EXPORTER_OTLP_PROTOCOL: grpc
+#        OTEL_EXPORTER_OTLP_ENDPOINT: http://localhost:4317
+#      run: cd tests/${{ testset }} && mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar --fail-at-end test --file pom.xml
+#    - name: Upload telemetry logs
+#      uses: actions/upload-artifact@v4
+#      if: always()
+#      continue-on-error: true
+#      with:
+#        name: build-telemetry-logs
+#        path: /tmp/tests-parquet/${{ testset }}/logs-*.parquet
+#    - name: Upload telemetry metrics
+#      uses: actions/upload-artifact@v4
+#      if: always()
+#      continue-on-error: true
+#      with:
+#        name: build-telemetry-metrics
+#        path: /tmp/tests-parquet/${{ testset }}/metrics-*.parquet
+#    - name: Upload telemetry traces
+#      uses: actions/upload-artifact@v4
+#      if: always()
+#      continue-on-error: true
+#      with:
+#        name: build-telemetry-traces
+#        path: /tmp/tests-parquet/${{ testset }}/traces-*.parquet
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
 
 #    - name: Publish Test Report

From 838c4d1db4264a6181f33bab98c6d3bbdc311c5a Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 09:01:42 +0200
Subject: [PATCH 12/29] Refactor workflow

---
 .github/workflows/maven.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 88681f8..9692b69 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -44,12 +44,12 @@ jobs:
       uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
       continue-on-error: true
 
-#  test:
-#    needs: compile
-#    runs-on: ubuntu-latest
-#    strategy:
-#      matrix:
-#        testset: ['coordination/base/', 'storage/block/base']
+  test:
+    needs: compile
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        testset: ['coordination/base/', 'storage/block/base']
 #    name: Testing ${{ testset }}
 #
 #    services:
@@ -61,13 +61,13 @@ jobs:
 #        volumes:
 #          - /tmp/tests-parquet/${{ testset }}:/parquet
 #
-#    steps:
-#    - uses: actions/checkout@v4
-#    - name: Set up JDK 17
-#      uses: actions/setup-java@v3
-#      with:
-#        java-version: '17'
-#        distribution: 'temurin'
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
 #    - name: Download latest OpenTelemetry java agent
 #      run: curl -L -o /tmp/opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
 #    - name: Cache build artifacts

From 685863cfeeca3cda1eca8213c51d4a87822a0571 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 09:11:30 +0200
Subject: [PATCH 13/29] Refactor workflow

---
 .github/workflows/maven.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9692b69..cd29ccf 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -34,23 +34,21 @@ jobs:
     - name: Build with Maven
       run: mvn -DskipTests install --file pom.xml
     - name: Cache build artifacts
-      uses: actions/cache@v3
+      uses: actions/cache/save@v4
       with:
         path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}-${{ hashFiles('~/.m2/repository/.cache/**/mishmash_io.patch*') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
     - name: Update dependency graph
       uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
       continue-on-error: true
 
   test:
-    needs: compile
+#    needs: compile
     runs-on: ubuntu-latest
     strategy:
       matrix:
         testset: ['coordination/base/', 'storage/block/base']
-#    name: Testing ${{ testset }}
+    name: Testing ${{ testset }}
 #
 #    services:
 #      otel-to-parquet:

From db2e4779d30697744cbef21e38bbefc9e9ddb055 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 09:18:16 +0200
Subject: [PATCH 14/29] Refactor workflow

---
 .github/workflows/maven.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index cd29ccf..b3097be 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -35,6 +35,7 @@ jobs:
       run: mvn -DskipTests install --file pom.xml
     - name: Cache build artifacts
       uses: actions/cache/save@v4
+      id: buildcache
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -43,12 +44,12 @@ jobs:
       continue-on-error: true
 
   test:
-#    needs: compile
+    needs: compile
     runs-on: ubuntu-latest
     strategy:
       matrix:
         testset: ['coordination/base/', 'storage/block/base']
-    name: Testing ${{ testset }}
+    name: Testing ${{ join(matrix.*, ' - ') }}
 #
 #    services:
 #      otel-to-parquet:
@@ -66,13 +67,16 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
-#    - name: Download latest OpenTelemetry java agent
-#      run: curl -L -o /tmp/opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
-#    - name: Cache build artifacts
-#      uses: actions/cache@v3
-#      with:
-#        path: ~/.m2/repository
-#        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml', '~/.m2/repository/.cache/**/mishmash_io.patch*') }}
+    - name: Download latest OpenTelemetry java agent
+      run: curl -L -o /tmp/opentelemetry-javaagent.jar https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
+    - name: Restore cached build artifacts
+      uses: actions/cache/restore@v4
+      id: buildcache
+      with:
+        path: ~/.m2/repository
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+    - name: Run ${{ matrix.testset }}
+      run: echo ${{ matrix.testset }}
 #        restore-keys: |
 #          ${{ runner.os }}-maven-
 #    - name: Run test set ${{ testset }}

From 71975c1b6e18961cddf67ca03cf80f630058cdbe Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 09:41:23 +0200
Subject: [PATCH 15/29] Refactor workflow

---
 .github/workflows/maven.yml | 94 ++++++++++++++++++++-----------------
 1 file changed, 51 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index b3097be..063c049 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -48,18 +48,30 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        testset: ['coordination/base/', 'storage/block/base']
-    name: Testing ${{ join(matrix.*, ' - ') }}
-#
-#    services:
-#      otel-to-parquet:
-#        image: mishmashio/opentelemetry-parquet-server
-#        ports:
-#          - 4317:4317
-#          - 4318:4318
-#        volumes:
-#          - /tmp/tests-parquet/${{ testset }}:/parquet
-#
+        testset: ['coordination/base', 'storage/block/base']
+        include:
+          - telemetryport: 4317
+            testset: 'coordination/base'
+          - telemetryport: 4319
+            testset: 'storage/block/base'
+          - telemetryoutput: 'coordination-base'
+            testset: 'coordination/base'
+          - telemetryoutput: 'storage-block-base'
+            testset: 'storage/block/base'
+          - testname: 'Base distributed coordination tests'
+            testset: 'coordination/base'
+          - testname: 'Base distributed block storage tests'
+            testset: 'storage/block/base'
+    name: Testing, ${{ join(matrix.*, ' - ') }}
+
+    services:
+      otel-to-parquet:
+        image: mishmashio/opentelemetry-parquet-server
+        ports:
+          - ${{ matrix.telemetryport }}:4317
+        volumes:
+          - /tmp/tests-parquet/${{ matrix.telemetryoutput }}:/parquet
+
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK 17
@@ -75,37 +87,33 @@ jobs:
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-    - name: Run ${{ matrix.testset }}
-      run: echo ${{ matrix.testset }}
-#        restore-keys: |
-#          ${{ runner.os }}-maven-
-#    - name: Run test set ${{ testset }}
-#      env:
-#        OTEL_SERVICE_NAME: maven-test-service
-#        OTEL_EXPORTER_OTLP_PROTOCOL: grpc
-#        OTEL_EXPORTER_OTLP_ENDPOINT: http://localhost:4317
-#      run: cd tests/${{ testset }} && mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar --fail-at-end test --file pom.xml
-#    - name: Upload telemetry logs
-#      uses: actions/upload-artifact@v4
-#      if: always()
-#      continue-on-error: true
-#      with:
-#        name: build-telemetry-logs
-#        path: /tmp/tests-parquet/${{ testset }}/logs-*.parquet
-#    - name: Upload telemetry metrics
-#      uses: actions/upload-artifact@v4
-#      if: always()
-#      continue-on-error: true
-#      with:
-#        name: build-telemetry-metrics
-#        path: /tmp/tests-parquet/${{ testset }}/metrics-*.parquet
-#    - name: Upload telemetry traces
-#      uses: actions/upload-artifact@v4
-#      if: always()
-#      continue-on-error: true
-#      with:
-#        name: build-telemetry-traces
-#        path: /tmp/tests-parquet/${{ testset }}/traces-*.parquet
+    - name: Run test set ${{ matrix.testset }}
+      env:
+        OTEL_SERVICE_NAME: maven-test-service
+        OTEL_EXPORTER_OTLP_PROTOCOL: grpc
+        OTEL_EXPORTER_OTLP_ENDPOINT: http://localhost:${{ matrix.telemetryport }}
+      run: cd tests/${{ matrix.testset }} && mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar test --file pom.xml
+    - name: Upload telemetry logs
+      uses: actions/upload-artifact@v4
+      if: always()
+      continue-on-error: true
+      with:
+        name: build-telemetry-logs-${{ matrix.telemetryoutput }}
+        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/logs-*.parquet
+    - name: Upload telemetry metrics
+      uses: actions/upload-artifact@v4
+      if: always()
+      continue-on-error: true
+      with:
+        name: build-telemetry-metrics-${{ matrix.telemetryoutput }}
+        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/metrics-*.parquet
+    - name: Upload telemetry traces
+      uses: actions/upload-artifact@v4
+      if: always()
+      continue-on-error: true
+      with:
+        name: build-telemetry-traces-${{ matrix.telemetryoutput }}
+        path: /tmp/tests-parquet/${{ testset }}/traces-*.parquet
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
 
 #    - name: Publish Test Report

From 4423dd3a41f375c01306e9ac1aa5ffa118802e9a Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 09:44:57 +0200
Subject: [PATCH 16/29] Refactor workflow

---
 .github/workflows/maven.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 063c049..6bc73b9 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -64,13 +64,13 @@ jobs:
             testset: 'storage/block/base'
     name: Testing, ${{ join(matrix.*, ' - ') }}
 
-    services:
-      otel-to-parquet:
-        image: mishmashio/opentelemetry-parquet-server
-        ports:
-          - ${{ matrix.telemetryport }}:4317
-        volumes:
-          - /tmp/tests-parquet/${{ matrix.telemetryoutput }}:/parquet
+#    services:
+#      otel-to-parquet:
+#        image: mishmashio/opentelemetry-parquet-server
+#        ports:
+#          - ${{ matrix.telemetryport }}:4317
+#        volumes:
+#          - /tmp/tests-parquet/${{ matrix.telemetryoutput }}:/parquet
 
     steps:
     - uses: actions/checkout@v4

From 14f6caa6fd6bb230dbf1de70fe16693594c2af43 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 09:47:19 +0200
Subject: [PATCH 17/29] Refactor workflow

---
 .github/workflows/maven.yml | 42 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 6bc73b9..d377c90 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -93,27 +93,27 @@ jobs:
         OTEL_EXPORTER_OTLP_PROTOCOL: grpc
         OTEL_EXPORTER_OTLP_ENDPOINT: http://localhost:${{ matrix.telemetryport }}
       run: cd tests/${{ matrix.testset }} && mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar test --file pom.xml
-    - name: Upload telemetry logs
-      uses: actions/upload-artifact@v4
-      if: always()
-      continue-on-error: true
-      with:
-        name: build-telemetry-logs-${{ matrix.telemetryoutput }}
-        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/logs-*.parquet
-    - name: Upload telemetry metrics
-      uses: actions/upload-artifact@v4
-      if: always()
-      continue-on-error: true
-      with:
-        name: build-telemetry-metrics-${{ matrix.telemetryoutput }}
-        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/metrics-*.parquet
-    - name: Upload telemetry traces
-      uses: actions/upload-artifact@v4
-      if: always()
-      continue-on-error: true
-      with:
-        name: build-telemetry-traces-${{ matrix.telemetryoutput }}
-        path: /tmp/tests-parquet/${{ testset }}/traces-*.parquet
+#    - name: Upload telemetry logs
+#      uses: actions/upload-artifact@v4
+#      if: always()
+#      continue-on-error: true
+#      with:
+#        name: build-telemetry-logs-${{ matrix.telemetryoutput }}
+#        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/logs-*.parquet
+#    - name: Upload telemetry metrics
+#      uses: actions/upload-artifact@v4
+#      if: always()
+#      continue-on-error: true
+#      with:
+#        name: build-telemetry-metrics-${{ matrix.telemetryoutput }}
+#        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/metrics-*.parquet
+#    - name: Upload telemetry traces
+#      uses: actions/upload-artifact@v4
+#      if: always()
+#      continue-on-error: true
+#      with:
+#        name: build-telemetry-traces-${{ matrix.telemetryoutput }}
+#        path: /tmp/tests-parquet/${{ testset }}/traces-*.parquet
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
 
 #    - name: Publish Test Report

From 05058374f38b4f3dc591637ee89e6c3cc0f44636 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 09:51:32 +0200
Subject: [PATCH 18/29] Refactor workflow

---
 .github/workflows/maven.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index d377c90..c13ad53 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -64,13 +64,13 @@ jobs:
             testset: 'storage/block/base'
     name: Testing, ${{ join(matrix.*, ' - ') }}
 
-#    services:
-#      otel-to-parquet:
-#        image: mishmashio/opentelemetry-parquet-server
-#        ports:
-#          - ${{ matrix.telemetryport }}:4317
-#        volumes:
-#          - /tmp/tests-parquet/${{ matrix.telemetryoutput }}:/parquet
+    services:
+      otel-to-parquet:
+        image: mishmashio/opentelemetry-parquet-server
+        ports:
+          - ${{ matrix.telemetryport }}:4317
+        volumes:
+          - /tmp/tests-parquet/${{ matrix.telemetryoutput }}:/parquet
 
     steps:
     - uses: actions/checkout@v4

From aa8839b2b9d81e9f379ff9597a7401d0fb8c8c0d Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 09:53:23 +0200
Subject: [PATCH 19/29] Refactor workflow

---
 .github/workflows/maven.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c13ad53..2953281 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -44,7 +44,7 @@ jobs:
       continue-on-error: true
 
   test:
-    needs: compile
+#    needs: compile
     runs-on: ubuntu-latest
     strategy:
       matrix:

From ddeb5afd4b7a756c5439fb0b2c12f39d295a82f2 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 09:57:23 +0200
Subject: [PATCH 20/29] Refactor workflow

---
 .github/workflows/maven.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 2953281..1756d52 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -87,6 +87,7 @@ jobs:
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        fail-on-cache-miss: true
     - name: Run test set ${{ matrix.testset }}
       env:
         OTEL_SERVICE_NAME: maven-test-service

From 8ec18a150b387da0ab83b98412fe7d082d46bc61 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 10:02:09 +0200
Subject: [PATCH 21/29] Refactor workflow

---
 .github/workflows/maven.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 1756d52..8506700 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -94,13 +94,13 @@ jobs:
         OTEL_EXPORTER_OTLP_PROTOCOL: grpc
         OTEL_EXPORTER_OTLP_ENDPOINT: http://localhost:${{ matrix.telemetryport }}
       run: cd tests/${{ matrix.testset }} && mvn -Dsurefire.rerunFailingTestsCount=2 -Dtest.instrumentation.opts=-javaagent:/tmp/opentelemetry-javaagent.jar test --file pom.xml
-#    - name: Upload telemetry logs
-#      uses: actions/upload-artifact@v4
-#      if: always()
-#      continue-on-error: true
-#      with:
-#        name: build-telemetry-logs-${{ matrix.telemetryoutput }}
-#        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/logs-*.parquet
+    - name: Upload telemetry logs
+      uses: actions/upload-artifact@v4
+      if: always()
+      continue-on-error: true
+      with:
+        name: build-telemetry-logs-${{ matrix.telemetryoutput }}
+        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/logs-*.parquet
 #    - name: Upload telemetry metrics
 #      uses: actions/upload-artifact@v4
 #      if: always()

From 3b6af7a23651e8635ccb76e117bc0d1d2ad4be28 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 10:04:48 +0200
Subject: [PATCH 22/29] Refactor workflow

---
 .github/workflows/maven.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 8506700..90482d9 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -101,20 +101,20 @@ jobs:
       with:
         name: build-telemetry-logs-${{ matrix.telemetryoutput }}
         path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/logs-*.parquet
-#    - name: Upload telemetry metrics
-#      uses: actions/upload-artifact@v4
-#      if: always()
-#      continue-on-error: true
-#      with:
-#        name: build-telemetry-metrics-${{ matrix.telemetryoutput }}
-#        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/metrics-*.parquet
-#    - name: Upload telemetry traces
-#      uses: actions/upload-artifact@v4
-#      if: always()
-#      continue-on-error: true
-#      with:
-#        name: build-telemetry-traces-${{ matrix.telemetryoutput }}
-#        path: /tmp/tests-parquet/${{ testset }}/traces-*.parquet
+    - name: Upload telemetry metrics
+      uses: actions/upload-artifact@v4
+      if: always()
+      continue-on-error: true
+      with:
+        name: build-telemetry-metrics-${{ matrix.telemetryoutput }}
+        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/metrics-*.parquet
+    - name: Upload telemetry traces
+      uses: actions/upload-artifact@v4
+      if: always()
+      continue-on-error: true
+      with:
+        name: build-telemetry-traces-${{ matrix.telemetryoutput }}
+        path: /tmp/tests-parquet/${{ matrix.telemetryoutput }}/traces-*.parquet
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
 
 #    - name: Publish Test Report

From c79ba60896c9f44c12290f4b871bcebafe214a5d Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 12:11:55 +0200
Subject: [PATCH 23/29] Fix build

---
 .github/workflows/maven.yml      |  2 +-
 hadoop/stable-base/pom.xml       |  7 ++++++-
 hadoop/stable/pom.xml            | 11 -----------
 tests/storage/block/base/pom.xml |  5 -----
 4 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 90482d9..a4b3f2a 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -44,7 +44,7 @@ jobs:
       continue-on-error: true
 
   test:
-#    needs: compile
+    needs: compile
     runs-on: ubuntu-latest
     strategy:
       matrix:
diff --git a/hadoop/stable-base/pom.xml b/hadoop/stable-base/pom.xml
index 5b2eac3..8e8a488 100644
--- a/hadoop/stable-base/pom.xml
+++ b/hadoop/stable-base/pom.xml
@@ -356,7 +356,12 @@
                     **/hadoop/util/hash/*.java,
                   </includes>
                   <excludes>
-
+                    **/hadoop/fs/CacheFlag.java,
+                    **/hadoop/fs/Hdfs.java,
+                    **/hadoop/fs/HdfsBlockLocation.java,
+                    **/hadoop/fs/SWebHdfs.java,
+                    **/hadoop/fs/WebHdfs.java,
+                    **/hadoop/fs/package.html
                   </excludes>
                 </artifactItem>
               </artifactItems>
diff --git a/hadoop/stable/pom.xml b/hadoop/stable/pom.xml
index 0776dbf..fd17ce9 100644
--- a/hadoop/stable/pom.xml
+++ b/hadoop/stable/pom.xml
@@ -539,12 +539,6 @@
         <version>${mockito.version}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-junit</artifactId>
-        <version>2.0.0.0</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.assertj</groupId>
         <artifactId>assertj-core</artifactId>
@@ -991,11 +985,6 @@
       <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
diff --git a/tests/storage/block/base/pom.xml b/tests/storage/block/base/pom.xml
index 238c18c..7453b49 100644
--- a/tests/storage/block/base/pom.xml
+++ b/tests/storage/block/base/pom.xml
@@ -305,11 +305,6 @@
       <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>

From aae321a5139fe8e31b125c1f9004f3fd22d34ab1 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 12:18:06 +0200
Subject: [PATCH 24/29] Upgrade logback

---
 zookeeper/stable/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zookeeper/stable/pom.xml b/zookeeper/stable/pom.xml
index 2926174..7f0028b 100644
--- a/zookeeper/stable/pom.xml
+++ b/zookeeper/stable/pom.xml
@@ -82,7 +82,7 @@
   </developers>
 
   <properties>
-    <logback-version>1.5.12</logback-version>
+    <logback-version>1.5.13</logback-version>
     <audience-annotations.version>0.15.0</audience-annotations.version>
     <jmockit.version>1.49</jmockit.version>
     <jline.version>2.14.6</jline.version>

From 70c3c8724910c5f667a31da76c2f9f5a6e3c7438 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 12:44:12 +0200
Subject: [PATCH 25/29] Fix workflow caching

---
 .github/workflows/maven.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a4b3f2a..d9aa1e9 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -31,6 +31,7 @@ jobs:
       with:
         java-version: '17'
         distribution: 'temurin'
+        cache: 'maven'
     - name: Build with Maven
       run: mvn -DskipTests install --file pom.xml
     - name: Cache build artifacts
@@ -38,7 +39,7 @@ jobs:
       id: buildcache
       with:
         path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        key: ${{ runner.os }}-maven-${{ env.GITHUB_RUN_ID }}-${{ env.GITHUB_RUN_ATTEMPT }}
     - name: Update dependency graph
       uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
       continue-on-error: true
@@ -86,7 +87,7 @@ jobs:
       id: buildcache
       with:
         path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+        key: ${{ runner.os }}-maven-${{ env.GITHUB_RUN_ID }}-${{ env.GITHUB_RUN_ATTEMPT }}
         fail-on-cache-miss: true
     - name: Run test set ${{ matrix.testset }}
       env:

From 56e62addd9142b530e052e015568c54119ef7028 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Fri, 20 Dec 2024 12:55:43 +0200
Subject: [PATCH 26/29] Allow workflow jobs to run independently

---
 .github/workflows/maven.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index d9aa1e9..d1d2103 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -48,6 +48,7 @@ jobs:
     needs: compile
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         testset: ['coordination/base', 'storage/block/base']
         include:

From 3a91c5d8363e31b611abab624de1aa0e1d858b72 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Sat, 21 Dec 2024 12:24:49 +0200
Subject: [PATCH 27/29] Update zk tests

---
 tests/coordination/base/pom.xml | 80 ++++++++++++++++++++++++---------
 zookeeper/stable/pom.xml        | 22 +++++++++
 2 files changed, 81 insertions(+), 21 deletions(-)

diff --git a/tests/coordination/base/pom.xml b/tests/coordination/base/pom.xml
index 4142cb2..f67c594 100644
--- a/tests/coordination/base/pom.xml
+++ b/tests/coordination/base/pom.xml
@@ -101,11 +101,46 @@
   </dependencyManagement>
   
   <dependencies>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.ee10</groupId>
+      <artifactId>jetty-ee10-servlet</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.xerial.snappy</groupId>
+      <artifactId>snappy-java</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>
@@ -185,15 +220,6 @@
       <groupId>io.mishmash.apache.zookeeper</groupId>
       <artifactId>mmio-zookeeper-stable</artifactId>
       <version>${zookeeper.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.mishmash.apache.zookeeper</groupId>
-      <artifactId>mmio-zookeeper-stable</artifactId>
-      <version>${zookeeper.version}</version>
-      <type>test-jar</type>
-      <classifier>tests</classifier>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 
@@ -202,15 +228,24 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.8.1</version>
         <executions>
           <execution>
-            <id>unpack</id>
+            <id>unpack-test-classes</id>
             <phase>process-test-classes</phase>
             <goals>
               <goal>unpack</goal>
             </goals>
             <configuration>
               <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.zookeeper</groupId>
+                  <artifactId>mmio-zookeeper-stable</artifactId>
+                  <version>${zookeeper.version}</version>
+                  <classifier>patched-sources</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/workdir</outputDirectory>
+                </artifactItem>
                 <artifactItem>
                   <groupId>io.mishmash.apache.zookeeper</groupId>
                   <artifactId>mmio-zookeeper-stable</artifactId>
@@ -227,16 +262,8 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.6.0</version>
         <executions>
-          <execution>
-            <id>tbuild-cpu-count</id>
-            <goals>
-              <goal>cpu-count</goal>
-            </goals>
-            <configuration>
-              <cpuCount>surefire-forkcount</cpuCount>
-            </configuration>
-          </execution>
           <execution>
             <id>tbuild-hostname</id>
             <goals>
@@ -251,6 +278,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
+        <version>3.3.1</version>
         <executions>
           <execution>
             <id>prepare-filtered-test-resource</id>
@@ -270,18 +298,28 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.13.0</version>
+        <configuration>
+          <source>17</source>
+          <target>17</target>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.0</version>
         <configuration>
           <includes>
             <include>**/*Test.java</include>
           </includes>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
-          <forkCount>${surefire-forkcount}</forkCount>
+          <forkCount>0.5C</forkCount>
           <reuseForks>false</reuseForks>
           <argLine>-Djdk.net.hosts.file=${project.build.directory}/generated-test-resources/hosts -Xmx512m -Dtest.junit.threads=${surefire-forkcount} -Dzookeeper.junit.threadid=${surefire.forkNumber} -javaagent:"${settings.localRepository}"/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar ${test.instrumentation.opts}</argLine>
-          <!--workingDirectory>${project.build.directory}/zookeeper-release-${zookeeper.stable.version}/zookeeper-server</workingDirectory-->
+          <workingDirectory>${project.build.directory}/workdir/zookeeper-server</workingDirectory>
           <systemPropertyVariables>
             <build.test.dir>${project.build.directory}/surefire</build.test.dir>
             <zookeeper.DigestAuthenticationProvider.superDigest>super:D/InIHSb7yEEbrWz8b9l71RjZJU=</zookeeper.DigestAuthenticationProvider.superDigest>
diff --git a/zookeeper/stable/pom.xml b/zookeeper/stable/pom.xml
index 7f0028b..344cd29 100644
--- a/zookeeper/stable/pom.xml
+++ b/zookeeper/stable/pom.xml
@@ -556,6 +556,28 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
+      <!-- package and attach a jar of all sources with patches applied. Do it before tests are run as they run inside the same dir (and create files in it) -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>package-patched-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-patched-sources.jar"
+                      basedir="${project.build.directory}/zookeeper-release-${zookeeper.stable.version}"
+                      includes="**"/>
+                <attachartifact file="${project.build.directory}/${project.artifactId}-${project.version}-patched-sources.jar" classifier="patched-sources" type="jar"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>

From 28598f64139c41f714177e0953489892a6e74352 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Sat, 21 Dec 2024 12:49:20 +0200
Subject: [PATCH 28/29] Update workflow run caches

---
 .github/workflows/maven.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index d1d2103..40c39af 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -39,7 +39,7 @@ jobs:
       id: buildcache
       with:
         path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ env.GITHUB_RUN_ID }}-${{ env.GITHUB_RUN_ATTEMPT }}
+        key: ${{ runner.os }}-maven-${{ github.run_id }}-${{ github.run_attempt }}
     - name: Update dependency graph
       uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
       continue-on-error: true
@@ -88,7 +88,7 @@ jobs:
       id: buildcache
       with:
         path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ env.GITHUB_RUN_ID }}-${{ env.GITHUB_RUN_ATTEMPT }}
+        key: ${{ runner.os }}-maven-${{ github.run_id }}-${{ github.run_attempt }}
         fail-on-cache-miss: true
     - name: Run test set ${{ matrix.testset }}
       env:

From a7517de161d4e3e3ce74d265d207bf86c1783b63 Mon Sep 17 00:00:00 2001
From: zzuljin <zethix@gmail.com>
Date: Sat, 21 Dec 2024 14:19:05 +0200
Subject: [PATCH 29/29] Add more test jobs

---
 .github/workflows/maven.yml                 |  47 +-
 hadoop/stable/pom.xml                       |  16 +
 tests/storage/block/balancer/pom.xml        | 466 +++++++++++++++++++
 tests/storage/block/base/pom.xml            |  27 +-
 tests/storage/block/blockmanagement/pom.xml | 466 +++++++++++++++++++
 tests/storage/block/datanode/pom.xml        | 466 +++++++++++++++++++
 tests/storage/block/dfs-base/pom.xml        | 473 ++++++++++++++++++++
 tests/storage/block/fs-base/pom.xml         | 469 +++++++++++++++++++
 tests/storage/block/misc/pom.xml            | 466 +++++++++++++++++++
 tests/storage/block/namenode/pom.xml        | 466 +++++++++++++++++++
 10 files changed, 3346 insertions(+), 16 deletions(-)
 create mode 100644 tests/storage/block/balancer/pom.xml
 create mode 100644 tests/storage/block/blockmanagement/pom.xml
 create mode 100644 tests/storage/block/datanode/pom.xml
 create mode 100644 tests/storage/block/dfs-base/pom.xml
 create mode 100644 tests/storage/block/fs-base/pom.xml
 create mode 100644 tests/storage/block/misc/pom.xml
 create mode 100644 tests/storage/block/namenode/pom.xml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 40c39af..e11c973 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -49,21 +49,66 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
+      max-parallel: 3
       matrix:
-        testset: ['coordination/base', 'storage/block/base']
+        testset:
+          - 'coordination/base'
+          - 'storage/block/base'
+          - 'storage/block/balancer'
+          - 'storage/block/blockmanagement'
+          - 'storage/block/datanode'
+          - 'storage/block/dfs-base'
+          - 'storage/block/fs-base'
+          - 'storage/block/misc'
         include:
           - telemetryport: 4317
             testset: 'coordination/base'
           - telemetryport: 4319
             testset: 'storage/block/base'
+          - telemetryport: 4321
+            testset: 'storage/block/balancer'
+          - telemetryport: 4323
+            testset: 'storage/block/blockmanagement'
+          - telemetryport: 4325
+            testset: 'storage/block/datanode'
+          - telemetryport: 4327
+            testset: 'storage/block/dfs-base'
+          - telemetryport: 4329
+            testset: 'storage/block/fs-base'
+          - telemetryport: 4331
+            testset: 'storage/block/misc'
           - telemetryoutput: 'coordination-base'
             testset: 'coordination/base'
           - telemetryoutput: 'storage-block-base'
             testset: 'storage/block/base'
+          - telemetryoutput: 'storage-block-balancer'
+            testset: 'storage/block/balancer'
+          - telemetryoutput: 'storage-block-blockmanagement'
+            testset: 'storage/block/blockmanagement'
+          - telemetryoutput: 'storage-block-datanode'
+            testset: 'storage/block/datanode'
+          - telemetryoutput: 'storage-block-dfs-base'
+            testset: 'storage/block/dfs-base'
+          - telemetryoutput: 'storage-block-fs-base'
+            testset: 'storage/block/fs-base'
+          - telemetryoutput: 'storage-block-misc'
+            testset: 'storage/block/misc'
           - testname: 'Base distributed coordination tests'
             testset: 'coordination/base'
           - testname: 'Base distributed block storage tests'
             testset: 'storage/block/base'
+          - testname: 'Distributed block storage balancer tests'
+            testset: 'storage/block/balancer'
+          - testname: 'Distributed block storage management tests'
+            testset: 'storage/block/blockmanagement'
+          - testname: 'Distributed block storage datanode tests'
+            testset: 'storage/block/datanode'
+          - testname: 'Base distributed block dfs storage tests'
+            testset: 'storage/block/dfs-base'
+          - testname: 'Base distributed block fs storage tests'
+            testset: 'storage/block/fs-base'
+          - testname: 'Misc distributed block storage tests'
+            testset: 'storage/block/misc'
     name: Testing, ${{ join(matrix.*, ' - ') }}
 
     services:
diff --git a/hadoop/stable/pom.xml b/hadoop/stable/pom.xml
index fd17ce9..14351da 100644
--- a/hadoop/stable/pom.xml
+++ b/hadoop/stable/pom.xml
@@ -1163,6 +1163,22 @@
               </target>
             </configuration>
           </execution>
+          <!-- package and attach a jar of all sources with patches applied. Do it before tests are run as they run inside the same dir (and create files in it) -->
+          <execution>
+            <id>package-patched-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <jar destfile="${project.build.directory}/${project.artifactId}-${project.version}-patched-sources.jar"
+                      basedir="${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}"
+                      includes="**"/>
+                <attachartifact file="${project.build.directory}/${project.artifactId}-${project.version}-patched-sources.jar" classifier="patched-sources" type="jar"/>
+              </target>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <!-- Add the patched sources for compilation -->
diff --git a/tests/storage/block/balancer/pom.xml b/tests/storage/block/balancer/pom.xml
new file mode 100644
index 0000000..671c615
--- /dev/null
+++ b/tests/storage/block/balancer/pom.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2024 Mishmash IO UK Ltd.
+
+  Licensed 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.mishmash.test.stacks</groupId>
+  <artifactId>test-storage-blocks-balancer</artifactId>
+  <version>1.0.0</version>
+
+  <name>Modifications and extensions of Apache Hadoop, by mishmash io</name>
+  <description>
+    Apache ZooKeeper is a service for coordinating processes of distributed applications.
+
+    This package contains Apache ZooKeeper as modified by mishmash io. For more info on the 
+    specific modifications visit our website and github.
+
+    It is recommended that you don't use this package directly, but rather - one of the 
+    dependency-reduced client or server packages.
+  </description>
+  <url>https://mishmash.io/open_source/apache_big_data</url>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>mishmash io</name>
+    <url>https://mishmash.io</url>
+  </organization>
+
+  <scm>
+    <connection>scm:git:https://github.com/mishmash-io/for-apache.git</connection>
+    <developerConnection>scm:git:https://github.com/mishmash-io/for-apache.git</developerConnection>
+    <url>https://github.com/mishmash-io/for-apache</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Ivan Kountchev</name>
+      <email>i.kountchev@mishmash.io</email>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Andrey Rusev</name>
+      <email>a.rusev@mishmash.io</email>
+      <url>www.linkedin.com/in/andrey-rusev-21894172</url>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>architect</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <properties>
+    <top.version>0.0.1</top.version>
+    <hadoop.version>3.4.1-mmio.1</hadoop.version>
+
+    <hadoop.common.build.dir>${project.build.directory}</hadoop.common.build.dir>
+    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+    <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
+    <java.security.egd>file:///dev/urandom</java.security.egd>
+    <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
+    <test.build.data>${test.build.dir}</test.build.data>
+    <test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+    <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps>
+
+    <test.instrumentation.opts></test.instrumentation.opts>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.mishmash.apache</groupId>
+        <artifactId>mmio-for-apache-parent</artifactId>
+        <version>${top.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.mishmash.apache.hadoop</groupId>
+        <artifactId>stable</artifactId>
+        <version>${hadoop.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>      
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>4.0.5</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- Updated to mishmash io minimal ZooKeeper -->
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-recipes</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerb-simplekdc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver3-junit5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-codec-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-model</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-integ</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-integ</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-sftp</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-console</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.mishmash.apache.hadoop</groupId>
+      <artifactId>stable</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>    
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.8.1</version>
+        <executions>
+          <execution>
+            <id>unpack-patched-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>patched-sources</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/workdir</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-tests</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>tests</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>create-log-dir</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                TODO: there are tests (TestLocalFileSystem#testCopy) that fail if data
+                TODO: from a previous run is present
+                -->
+                <delete dir="${test.build.data}"/>
+                <mkdir dir="${test.build.data}"/>
+                <mkdir dir="${hadoop.log.dir}"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.0</version>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ${test.instrumentation.opts}</argLine>
+          <environmentVariables>
+            <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME>
+            <!-- HADOOP_HOME required for tests on Windows to find winutils -->
+            <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
+            <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</LD_LIBRARY_PATH>
+            <DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
+            <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+
+            <!--
+              Disable the servlet instrumentation for now, because the TestAuthenticationFilter
+              uses Mockito.verifyNoMoreInteractions(<HttpServletResponse mocks>), and OpenTelemetry
+              does interact with HttpServletResponse(s).
+
+              Another solution might be to tell Otel to not instrument Mockito mocked classes, if it can recognize them
+            -->
+            <OTEL_INSTRUMENTATION_SERVLET_ENABLED>false</OTEL_INSTRUMENTATION_SERVLET_ENABLED>
+            <OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>false</OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>
+          </environmentVariables>
+          <systemPropertyVariables>
+            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
+            <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
+
+            <test.build.dir>${test.build.dir}</test.build.dir>
+            <test.build.data>${test.build.data}</test.build.data>
+            <test.build.webapps>${test.build.webapps}</test.build.webapps>
+            <test.cache.data>${test.cache.data}</test.cache.data>
+            <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+
+            <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
+            <java.security.egd>${java.security.egd}</java.security.egd>
+            <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
+
+            <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
+          </systemPropertyVariables>
+          <properties>
+            <!-- set a default timeout of 10 minutes to all tests -->
+            <configurationParameters>
+              junit.jupiter.execution.timeout.default = 10m
+            </configurationParameters>
+          </properties>
+          <workingDirectory>${project.build.directory}/workdir/hadoop-common-project/hadoop-common</workingDirectory>
+          <includes>
+            **/hadoop/hdfs/server/balancer/**
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/storage/block/base/pom.xml b/tests/storage/block/base/pom.xml
index 7453b49..0cea510 100644
--- a/tests/storage/block/base/pom.xml
+++ b/tests/storage/block/base/pom.xml
@@ -332,14 +332,6 @@
       <version>${hadoop.version}</version>
       <scope>test</scope>    
     </dependency>
-    <dependency>
-      <groupId>io.mishmash.apache.hadoop</groupId>
-      <artifactId>stable</artifactId>
-      <version>${hadoop.version}</version>
-      <type>test-jar</type>
-      <classifier>tests</classifier>
-      <scope>test</scope>    
-    </dependency>
   </dependencies>
 
   <build>
@@ -347,9 +339,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.8.1</version>
         <executions>
           <execution>
-            <id>unpack-sources</id>
+            <id>unpack-patched-sources</id>
             <phase>process-test-classes</phase>
             <goals>
               <goal>unpack</goal>
@@ -360,9 +353,9 @@
                   <groupId>io.mishmash.apache.hadoop</groupId>
                   <artifactId>stable</artifactId>
                   <version>${hadoop.version}</version>
-                  <classifier>sources</classifier>
+                  <classifier>patched-sources</classifier>
                   <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/workdir/src/main/java</outputDirectory>
+                  <outputDirectory>${project.build.directory}/workdir</outputDirectory>
                 </artifactItem>
               </artifactItems>
             </configuration>
@@ -391,6 +384,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <id>create-log-dir</id>
@@ -415,7 +409,9 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.0</version>
         <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
           <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ${test.instrumentation.opts}</argLine>
@@ -459,10 +455,11 @@
               junit.jupiter.execution.timeout.default = 10m
             </configurationParameters>
           </properties>
-          <workingDirectory>${project.build.directory}/workdir</workingDirectory>
-          <includes>
-            <include>**/hadoop/cli/**</include>
-          </includes>
+          <workingDirectory>${project.build.directory}/workdir/hadoop-common-project/hadoop-common</workingDirectory>
+          <excludes>
+            **/hadoop/fs/**,
+            **/hadoop/hdfs/**
+          </excludes>
         </configuration>
       </plugin>
     </plugins>
diff --git a/tests/storage/block/blockmanagement/pom.xml b/tests/storage/block/blockmanagement/pom.xml
new file mode 100644
index 0000000..ef014d5
--- /dev/null
+++ b/tests/storage/block/blockmanagement/pom.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2024 Mishmash IO UK Ltd.
+
+  Licensed 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.mishmash.test.stacks</groupId>
+  <artifactId>test-storage-blocks-blockmanagement</artifactId>
+  <version>1.0.0</version>
+
+  <name>Modifications and extensions of Apache Hadoop, by mishmash io</name>
+  <description>
+    Apache ZooKeeper is a service for coordinating processes of distributed applications.
+
+    This package contains Apache ZooKeeper as modified by mishmash io. For more info on the 
+    specific modifications visit our website and github.
+
+    It is recommended that you don't use this package directly, but rather - one of the 
+    dependency-reduced client or server packages.
+  </description>
+  <url>https://mishmash.io/open_source/apache_big_data</url>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>mishmash io</name>
+    <url>https://mishmash.io</url>
+  </organization>
+
+  <scm>
+    <connection>scm:git:https://github.com/mishmash-io/for-apache.git</connection>
+    <developerConnection>scm:git:https://github.com/mishmash-io/for-apache.git</developerConnection>
+    <url>https://github.com/mishmash-io/for-apache</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Ivan Kountchev</name>
+      <email>i.kountchev@mishmash.io</email>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Andrey Rusev</name>
+      <email>a.rusev@mishmash.io</email>
+      <url>www.linkedin.com/in/andrey-rusev-21894172</url>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>architect</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <properties>
+    <top.version>0.0.1</top.version>
+    <hadoop.version>3.4.1-mmio.1</hadoop.version>
+
+    <hadoop.common.build.dir>${project.build.directory}</hadoop.common.build.dir>
+    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+    <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
+    <java.security.egd>file:///dev/urandom</java.security.egd>
+    <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
+    <test.build.data>${test.build.dir}</test.build.data>
+    <test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+    <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps>
+
+    <test.instrumentation.opts></test.instrumentation.opts>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.mishmash.apache</groupId>
+        <artifactId>mmio-for-apache-parent</artifactId>
+        <version>${top.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.mishmash.apache.hadoop</groupId>
+        <artifactId>stable</artifactId>
+        <version>${hadoop.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>      
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>4.0.5</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- Updated to mishmash io minimal ZooKeeper -->
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-recipes</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerb-simplekdc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver3-junit5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-codec-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-model</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-integ</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-integ</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-sftp</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-console</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.mishmash.apache.hadoop</groupId>
+      <artifactId>stable</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>    
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.8.1</version>
+        <executions>
+          <execution>
+            <id>unpack-patched-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>patched-sources</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/workdir</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-tests</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>tests</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>create-log-dir</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                TODO: there are tests (TestLocalFileSystem#testCopy) that fail if data
+                TODO: from a previous run is present
+                -->
+                <delete dir="${test.build.data}"/>
+                <mkdir dir="${test.build.data}"/>
+                <mkdir dir="${hadoop.log.dir}"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.0</version>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ${test.instrumentation.opts}</argLine>
+          <environmentVariables>
+            <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME>
+            <!-- HADOOP_HOME required for tests on Windows to find winutils -->
+            <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
+            <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</LD_LIBRARY_PATH>
+            <DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
+            <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+
+            <!--
+              Disable the servlet instrumentation for now, because the TestAuthenticationFilter
+              uses Mockito.verifyNoMoreInteractions(<HttpServletResponse mocks>), and OpenTelemetry
+              does interact with HttpServletResponse(s).
+
+              Another solution might be to tell Otel to not instrument Mockito mocked classes, if it can recognize them
+            -->
+            <OTEL_INSTRUMENTATION_SERVLET_ENABLED>false</OTEL_INSTRUMENTATION_SERVLET_ENABLED>
+            <OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>false</OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>
+          </environmentVariables>
+          <systemPropertyVariables>
+            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
+            <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
+
+            <test.build.dir>${test.build.dir}</test.build.dir>
+            <test.build.data>${test.build.data}</test.build.data>
+            <test.build.webapps>${test.build.webapps}</test.build.webapps>
+            <test.cache.data>${test.cache.data}</test.cache.data>
+            <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+
+            <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
+            <java.security.egd>${java.security.egd}</java.security.egd>
+            <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
+
+            <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
+          </systemPropertyVariables>
+          <properties>
+            <!-- set a default timeout of 10 minutes to all tests -->
+            <configurationParameters>
+              junit.jupiter.execution.timeout.default = 10m
+            </configurationParameters>
+          </properties>
+          <workingDirectory>${project.build.directory}/workdir/hadoop-common-project/hadoop-common</workingDirectory>
+          <includes>
+            **/hadoop/hdfs/server/blockmanagement/**
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/storage/block/datanode/pom.xml b/tests/storage/block/datanode/pom.xml
new file mode 100644
index 0000000..38a7cc2
--- /dev/null
+++ b/tests/storage/block/datanode/pom.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2024 Mishmash IO UK Ltd.
+
+  Licensed 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.mishmash.test.stacks</groupId>
+  <artifactId>test-storage-blocks-datanode</artifactId>
+  <version>1.0.0</version>
+
+  <name>Modifications and extensions of Apache Hadoop, by mishmash io</name>
+  <description>
+    Apache ZooKeeper is a service for coordinating processes of distributed applications.
+
+    This package contains Apache ZooKeeper as modified by mishmash io. For more info on the 
+    specific modifications visit our website and github.
+
+    It is recommended that you don't use this package directly, but rather - one of the 
+    dependency-reduced client or server packages.
+  </description>
+  <url>https://mishmash.io/open_source/apache_big_data</url>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>mishmash io</name>
+    <url>https://mishmash.io</url>
+  </organization>
+
+  <scm>
+    <connection>scm:git:https://github.com/mishmash-io/for-apache.git</connection>
+    <developerConnection>scm:git:https://github.com/mishmash-io/for-apache.git</developerConnection>
+    <url>https://github.com/mishmash-io/for-apache</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Ivan Kountchev</name>
+      <email>i.kountchev@mishmash.io</email>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Andrey Rusev</name>
+      <email>a.rusev@mishmash.io</email>
+      <url>www.linkedin.com/in/andrey-rusev-21894172</url>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>architect</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <properties>
+    <top.version>0.0.1</top.version>
+    <hadoop.version>3.4.1-mmio.1</hadoop.version>
+
+    <hadoop.common.build.dir>${project.build.directory}</hadoop.common.build.dir>
+    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+    <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
+    <java.security.egd>file:///dev/urandom</java.security.egd>
+    <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
+    <test.build.data>${test.build.dir}</test.build.data>
+    <test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+    <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps>
+
+    <test.instrumentation.opts></test.instrumentation.opts>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.mishmash.apache</groupId>
+        <artifactId>mmio-for-apache-parent</artifactId>
+        <version>${top.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.mishmash.apache.hadoop</groupId>
+        <artifactId>stable</artifactId>
+        <version>${hadoop.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>      
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>4.0.5</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- Updated to mishmash io minimal ZooKeeper -->
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-recipes</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerb-simplekdc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver3-junit5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-codec-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-model</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-integ</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-integ</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-sftp</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-console</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.mishmash.apache.hadoop</groupId>
+      <artifactId>stable</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>    
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.8.1</version>
+        <executions>
+          <execution>
+            <id>unpack-patched-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>patched-sources</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/workdir</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-tests</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>tests</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>create-log-dir</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                TODO: there are tests (TestLocalFileSystem#testCopy) that fail if data
+                TODO: from a previous run is present
+                -->
+                <delete dir="${test.build.data}"/>
+                <mkdir dir="${test.build.data}"/>
+                <mkdir dir="${hadoop.log.dir}"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.0</version>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ${test.instrumentation.opts}</argLine>
+          <environmentVariables>
+            <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME>
+            <!-- HADOOP_HOME required for tests on Windows to find winutils -->
+            <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
+            <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</LD_LIBRARY_PATH>
+            <DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
+            <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+
+            <!--
+              Disable the servlet instrumentation for now, because the TestAuthenticationFilter
+              uses Mockito.verifyNoMoreInteractions(<HttpServletResponse mocks>), and OpenTelemetry
+              does interact with HttpServletResponse(s).
+
+              Another solution might be to tell Otel to not instrument Mockito mocked classes, if it can recognize them
+            -->
+            <OTEL_INSTRUMENTATION_SERVLET_ENABLED>false</OTEL_INSTRUMENTATION_SERVLET_ENABLED>
+            <OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>false</OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>
+          </environmentVariables>
+          <systemPropertyVariables>
+            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
+            <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
+
+            <test.build.dir>${test.build.dir}</test.build.dir>
+            <test.build.data>${test.build.data}</test.build.data>
+            <test.build.webapps>${test.build.webapps}</test.build.webapps>
+            <test.cache.data>${test.cache.data}</test.cache.data>
+            <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+
+            <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
+            <java.security.egd>${java.security.egd}</java.security.egd>
+            <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
+
+            <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
+          </systemPropertyVariables>
+          <properties>
+            <!-- set a default timeout of 10 minutes to all tests -->
+            <configurationParameters>
+              junit.jupiter.execution.timeout.default = 10m
+            </configurationParameters>
+          </properties>
+          <workingDirectory>${project.build.directory}/workdir/hadoop-common-project/hadoop-common</workingDirectory>
+          <includes>
+            **/hadoop/hdfs/server/datanode/**
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/storage/block/dfs-base/pom.xml b/tests/storage/block/dfs-base/pom.xml
new file mode 100644
index 0000000..2ab08c6
--- /dev/null
+++ b/tests/storage/block/dfs-base/pom.xml
@@ -0,0 +1,473 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2024 Mishmash IO UK Ltd.
+
+  Licensed 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.mishmash.test.stacks</groupId>
+  <artifactId>test-storage-blocks-dfs-base</artifactId>
+  <version>1.0.0</version>
+
+  <name>Modifications and extensions of Apache Hadoop, by mishmash io</name>
+  <description>
+    Apache ZooKeeper is a service for coordinating processes of distributed applications.
+
+    This package contains Apache ZooKeeper as modified by mishmash io. For more info on the 
+    specific modifications visit our website and github.
+
+    It is recommended that you don't use this package directly, but rather - one of the 
+    dependency-reduced client or server packages.
+  </description>
+  <url>https://mishmash.io/open_source/apache_big_data</url>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>mishmash io</name>
+    <url>https://mishmash.io</url>
+  </organization>
+
+  <scm>
+    <connection>scm:git:https://github.com/mishmash-io/for-apache.git</connection>
+    <developerConnection>scm:git:https://github.com/mishmash-io/for-apache.git</developerConnection>
+    <url>https://github.com/mishmash-io/for-apache</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Ivan Kountchev</name>
+      <email>i.kountchev@mishmash.io</email>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Andrey Rusev</name>
+      <email>a.rusev@mishmash.io</email>
+      <url>www.linkedin.com/in/andrey-rusev-21894172</url>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>architect</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <properties>
+    <top.version>0.0.1</top.version>
+    <hadoop.version>3.4.1-mmio.1</hadoop.version>
+
+    <hadoop.common.build.dir>${project.build.directory}</hadoop.common.build.dir>
+    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+    <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
+    <java.security.egd>file:///dev/urandom</java.security.egd>
+    <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
+    <test.build.data>${test.build.dir}</test.build.data>
+    <test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+    <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps>
+
+    <test.instrumentation.opts></test.instrumentation.opts>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.mishmash.apache</groupId>
+        <artifactId>mmio-for-apache-parent</artifactId>
+        <version>${top.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.mishmash.apache.hadoop</groupId>
+        <artifactId>stable</artifactId>
+        <version>${hadoop.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>      
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>4.0.5</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- Updated to mishmash io minimal ZooKeeper -->
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-recipes</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerb-simplekdc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver3-junit5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-codec-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-model</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-integ</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-integ</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-sftp</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-console</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.mishmash.apache.hadoop</groupId>
+      <artifactId>stable</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>    
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.8.1</version>
+        <executions>
+          <execution>
+            <id>unpack-patched-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>patched-sources</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/workdir</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-tests</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>tests</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>create-log-dir</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                TODO: there are tests (TestLocalFileSystem#testCopy) that fail if data
+                TODO: from a previous run is present
+                -->
+                <delete dir="${test.build.data}"/>
+                <mkdir dir="${test.build.data}"/>
+                <mkdir dir="${hadoop.log.dir}"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.0</version>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ${test.instrumentation.opts}</argLine>
+          <environmentVariables>
+            <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME>
+            <!-- HADOOP_HOME required for tests on Windows to find winutils -->
+            <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
+            <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</LD_LIBRARY_PATH>
+            <DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
+            <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+
+            <!--
+              Disable the servlet instrumentation for now, because the TestAuthenticationFilter
+              uses Mockito.verifyNoMoreInteractions(<HttpServletResponse mocks>), and OpenTelemetry
+              does interact with HttpServletResponse(s).
+
+              Another solution might be to tell Otel to not instrument Mockito mocked classes, if it can recognize them
+            -->
+            <OTEL_INSTRUMENTATION_SERVLET_ENABLED>false</OTEL_INSTRUMENTATION_SERVLET_ENABLED>
+            <OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>false</OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>
+          </environmentVariables>
+          <systemPropertyVariables>
+            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
+            <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
+
+            <test.build.dir>${test.build.dir}</test.build.dir>
+            <test.build.data>${test.build.data}</test.build.data>
+            <test.build.webapps>${test.build.webapps}</test.build.webapps>
+            <test.cache.data>${test.cache.data}</test.cache.data>
+            <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+
+            <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
+            <java.security.egd>${java.security.egd}</java.security.egd>
+            <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
+
+            <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
+          </systemPropertyVariables>
+          <properties>
+            <!-- set a default timeout of 10 minutes to all tests -->
+            <configurationParameters>
+              junit.jupiter.execution.timeout.default = 10m
+            </configurationParameters>
+          </properties>
+          <workingDirectory>${project.build.directory}/workdir/hadoop-common-project/hadoop-common</workingDirectory>
+          <includes>
+            **/hdfs/**
+          </includes>
+          <excludes>
+            **/hadoop/hdfs/server/balancer/**,
+            **/hadoop/hdfs/server/blockmanagement/**,
+            **/hadoop/hdfs/server/datanode/**,
+            **/hadoop/hdfs/server/namenode/**,
+            **/hadoop/hdfs/*
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/storage/block/fs-base/pom.xml b/tests/storage/block/fs-base/pom.xml
new file mode 100644
index 0000000..d48079d
--- /dev/null
+++ b/tests/storage/block/fs-base/pom.xml
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2024 Mishmash IO UK Ltd.
+
+  Licensed 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.mishmash.test.stacks</groupId>
+  <artifactId>test-storage-blocks-fs-base</artifactId>
+  <version>1.0.0</version>
+
+  <name>Modifications and extensions of Apache Hadoop, by mishmash io</name>
+  <description>
+    Apache ZooKeeper is a service for coordinating processes of distributed applications.
+
+    This package contains Apache ZooKeeper as modified by mishmash io. For more info on the 
+    specific modifications visit our website and github.
+
+    It is recommended that you don't use this package directly, but rather - one of the 
+    dependency-reduced client or server packages.
+  </description>
+  <url>https://mishmash.io/open_source/apache_big_data</url>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>mishmash io</name>
+    <url>https://mishmash.io</url>
+  </organization>
+
+  <scm>
+    <connection>scm:git:https://github.com/mishmash-io/for-apache.git</connection>
+    <developerConnection>scm:git:https://github.com/mishmash-io/for-apache.git</developerConnection>
+    <url>https://github.com/mishmash-io/for-apache</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Ivan Kountchev</name>
+      <email>i.kountchev@mishmash.io</email>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Andrey Rusev</name>
+      <email>a.rusev@mishmash.io</email>
+      <url>www.linkedin.com/in/andrey-rusev-21894172</url>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>architect</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <properties>
+    <top.version>0.0.1</top.version>
+    <hadoop.version>3.4.1-mmio.1</hadoop.version>
+
+    <hadoop.common.build.dir>${project.build.directory}</hadoop.common.build.dir>
+    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+    <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
+    <java.security.egd>file:///dev/urandom</java.security.egd>
+    <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
+    <test.build.data>${test.build.dir}</test.build.data>
+    <test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+    <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps>
+
+    <test.instrumentation.opts></test.instrumentation.opts>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.mishmash.apache</groupId>
+        <artifactId>mmio-for-apache-parent</artifactId>
+        <version>${top.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.mishmash.apache.hadoop</groupId>
+        <artifactId>stable</artifactId>
+        <version>${hadoop.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>      
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>4.0.5</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- Updated to mishmash io minimal ZooKeeper -->
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-recipes</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerb-simplekdc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver3-junit5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-codec-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-model</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-integ</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-integ</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-sftp</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-console</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.mishmash.apache.hadoop</groupId>
+      <artifactId>stable</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>    
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.8.1</version>
+        <executions>
+          <execution>
+            <id>unpack-patched-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>patched-sources</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/workdir</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-tests</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>tests</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>create-log-dir</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                TODO: there are tests (TestLocalFileSystem#testCopy) that fail if data
+                TODO: from a previous run is present
+                -->
+                <delete dir="${test.build.data}"/>
+                <mkdir dir="${test.build.data}"/>
+                <mkdir dir="${hadoop.log.dir}"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.0</version>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ${test.instrumentation.opts}</argLine>
+          <environmentVariables>
+            <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME>
+            <!-- HADOOP_HOME required for tests on Windows to find winutils -->
+            <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
+            <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</LD_LIBRARY_PATH>
+            <DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
+            <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+
+            <!--
+              Disable the servlet instrumentation for now, because the TestAuthenticationFilter
+              uses Mockito.verifyNoMoreInteractions(<HttpServletResponse mocks>), and OpenTelemetry
+              does interact with HttpServletResponse(s).
+
+              Another solution might be to tell Otel to not instrument Mockito mocked classes, if it can recognize them
+            -->
+            <OTEL_INSTRUMENTATION_SERVLET_ENABLED>false</OTEL_INSTRUMENTATION_SERVLET_ENABLED>
+            <OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>false</OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>
+          </environmentVariables>
+          <systemPropertyVariables>
+            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
+            <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
+
+            <test.build.dir>${test.build.dir}</test.build.dir>
+            <test.build.data>${test.build.data}</test.build.data>
+            <test.build.webapps>${test.build.webapps}</test.build.webapps>
+            <test.cache.data>${test.cache.data}</test.cache.data>
+            <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+
+            <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
+            <java.security.egd>${java.security.egd}</java.security.egd>
+            <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
+
+            <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
+          </systemPropertyVariables>
+          <properties>
+            <!-- set a default timeout of 10 minutes to all tests -->
+            <configurationParameters>
+              junit.jupiter.execution.timeout.default = 10m
+            </configurationParameters>
+          </properties>
+          <workingDirectory>${project.build.directory}/workdir/hadoop-common-project/hadoop-common</workingDirectory>
+          <includes>
+            **/hadoop/fs/**
+          </includes>
+          <excludes>
+            **/hdfs/**,
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/storage/block/misc/pom.xml b/tests/storage/block/misc/pom.xml
new file mode 100644
index 0000000..0de14f3
--- /dev/null
+++ b/tests/storage/block/misc/pom.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2024 Mishmash IO UK Ltd.
+
+  Licensed 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.mishmash.test.stacks</groupId>
+  <artifactId>test-storage-blocks-misc</artifactId>
+  <version>1.0.0</version>
+
+  <name>Modifications and extensions of Apache Hadoop, by mishmash io</name>
+  <description>
+    Apache ZooKeeper is a service for coordinating processes of distributed applications.
+
+    This package contains Apache ZooKeeper as modified by mishmash io. For more info on the 
+    specific modifications visit our website and github.
+
+    It is recommended that you don't use this package directly, but rather - one of the 
+    dependency-reduced client or server packages.
+  </description>
+  <url>https://mishmash.io/open_source/apache_big_data</url>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>mishmash io</name>
+    <url>https://mishmash.io</url>
+  </organization>
+
+  <scm>
+    <connection>scm:git:https://github.com/mishmash-io/for-apache.git</connection>
+    <developerConnection>scm:git:https://github.com/mishmash-io/for-apache.git</developerConnection>
+    <url>https://github.com/mishmash-io/for-apache</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Ivan Kountchev</name>
+      <email>i.kountchev@mishmash.io</email>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Andrey Rusev</name>
+      <email>a.rusev@mishmash.io</email>
+      <url>www.linkedin.com/in/andrey-rusev-21894172</url>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>architect</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <properties>
+    <top.version>0.0.1</top.version>
+    <hadoop.version>3.4.1-mmio.1</hadoop.version>
+
+    <hadoop.common.build.dir>${project.build.directory}</hadoop.common.build.dir>
+    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+    <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
+    <java.security.egd>file:///dev/urandom</java.security.egd>
+    <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
+    <test.build.data>${test.build.dir}</test.build.data>
+    <test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+    <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps>
+
+    <test.instrumentation.opts></test.instrumentation.opts>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.mishmash.apache</groupId>
+        <artifactId>mmio-for-apache-parent</artifactId>
+        <version>${top.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.mishmash.apache.hadoop</groupId>
+        <artifactId>stable</artifactId>
+        <version>${hadoop.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>      
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>4.0.5</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- Updated to mishmash io minimal ZooKeeper -->
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-recipes</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerb-simplekdc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver3-junit5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-codec-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-model</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-integ</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-integ</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-sftp</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-console</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.mishmash.apache.hadoop</groupId>
+      <artifactId>stable</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>    
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.8.1</version>
+        <executions>
+          <execution>
+            <id>unpack-patched-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>patched-sources</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/workdir</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-tests</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>tests</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>create-log-dir</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                TODO: there are tests (TestLocalFileSystem#testCopy) that fail if data
+                TODO: from a previous run is present
+                -->
+                <delete dir="${test.build.data}"/>
+                <mkdir dir="${test.build.data}"/>
+                <mkdir dir="${hadoop.log.dir}"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.0</version>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ${test.instrumentation.opts}</argLine>
+          <environmentVariables>
+            <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME>
+            <!-- HADOOP_HOME required for tests on Windows to find winutils -->
+            <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
+            <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</LD_LIBRARY_PATH>
+            <DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
+            <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+
+            <!--
+              Disable the servlet instrumentation for now, because the TestAuthenticationFilter
+              uses Mockito.verifyNoMoreInteractions(<HttpServletResponse mocks>), and OpenTelemetry
+              does interact with HttpServletResponse(s).
+
+              Another solution might be to tell Otel to not instrument Mockito mocked classes, if it can recognize them
+            -->
+            <OTEL_INSTRUMENTATION_SERVLET_ENABLED>false</OTEL_INSTRUMENTATION_SERVLET_ENABLED>
+            <OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>false</OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>
+          </environmentVariables>
+          <systemPropertyVariables>
+            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
+            <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
+
+            <test.build.dir>${test.build.dir}</test.build.dir>
+            <test.build.data>${test.build.data}</test.build.data>
+            <test.build.webapps>${test.build.webapps}</test.build.webapps>
+            <test.cache.data>${test.cache.data}</test.cache.data>
+            <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+
+            <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
+            <java.security.egd>${java.security.egd}</java.security.egd>
+            <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
+
+            <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
+          </systemPropertyVariables>
+          <properties>
+            <!-- set a default timeout of 10 minutes to all tests -->
+            <configurationParameters>
+              junit.jupiter.execution.timeout.default = 10m
+            </configurationParameters>
+          </properties>
+          <workingDirectory>${project.build.directory}/workdir/hadoop-common-project/hadoop-common</workingDirectory>
+          <includes>
+            **/hadoop/hdfs/*
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/storage/block/namenode/pom.xml b/tests/storage/block/namenode/pom.xml
new file mode 100644
index 0000000..f160c7d
--- /dev/null
+++ b/tests/storage/block/namenode/pom.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2024 Mishmash IO UK Ltd.
+
+  Licensed 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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>io.mishmash.test.stacks</groupId>
+  <artifactId>test-storage-blocks-namenode</artifactId>
+  <version>1.0.0</version>
+
+  <name>Modifications and extensions of Apache Hadoop, by mishmash io</name>
+  <description>
+    Apache ZooKeeper is a service for coordinating processes of distributed applications.
+
+    This package contains Apache ZooKeeper as modified by mishmash io. For more info on the 
+    specific modifications visit our website and github.
+
+    It is recommended that you don't use this package directly, but rather - one of the 
+    dependency-reduced client or server packages.
+  </description>
+  <url>https://mishmash.io/open_source/apache_big_data</url>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <organization>
+    <name>mishmash io</name>
+    <url>https://mishmash.io</url>
+  </organization>
+
+  <scm>
+    <connection>scm:git:https://github.com/mishmash-io/for-apache.git</connection>
+    <developerConnection>scm:git:https://github.com/mishmash-io/for-apache.git</developerConnection>
+    <url>https://github.com/mishmash-io/for-apache</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <name>Ivan Kountchev</name>
+      <email>i.kountchev@mishmash.io</email>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Andrey Rusev</name>
+      <email>a.rusev@mishmash.io</email>
+      <url>www.linkedin.com/in/andrey-rusev-21894172</url>
+      <organization>mishmash io</organization>
+      <organizationUrl>https://mishmash.io</organizationUrl>
+      <roles>
+        <role>architect</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <properties>
+    <top.version>0.0.1</top.version>
+    <hadoop.version>3.4.1-mmio.1</hadoop.version>
+
+    <hadoop.common.build.dir>${project.build.directory}</hadoop.common.build.dir>
+    <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+    <hadoop.tmp.dir>${project.build.directory}/tmp</hadoop.tmp.dir>
+    <java.security.egd>file:///dev/urandom</java.security.egd>
+    <test.build.dir>${project.build.directory}/test-dir</test.build.dir>
+    <test.build.data>${test.build.dir}</test.build.data>
+    <test.cache.data>${project.build.directory}/test-classes</test.cache.data>
+    <test.build.webapps>${project.build.directory}/test-classes/webapps</test.build.webapps>
+
+    <test.instrumentation.opts></test.instrumentation.opts>
+  </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>io.mishmash.apache</groupId>
+        <artifactId>mmio-for-apache-parent</artifactId>
+        <version>${top.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.mishmash.apache.hadoop</groupId>
+        <artifactId>stable</artifactId>
+        <version>${hadoop.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>      
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.activation</groupId>
+      <artifactId>jakarta.activation-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>4.0.5</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- Updated to mishmash io minimal ZooKeeper -->
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-framework</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-recipes</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.lz4</groupId>
+      <artifactId>lz4-java</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.lmax</groupId>
+      <artifactId>disruptor</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kerby</groupId>
+      <artifactId>kerb-simplekdc</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.wildfly.openssl</groupId>
+      <artifactId>wildfly-openssl</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver3-junit5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.mock-server</groupId>
+      <artifactId>mockserver-netty</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib-jdk8</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.mishmash.apache.zookeeper</groupId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
+      <classifier>tests</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.curator</groupId>
+      <artifactId>curator-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-protocol-ldap</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-ldif-partition</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-codec-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-model</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-server-integ</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-core-integ</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-sftp</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk18on</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-console</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jettison</groupId>
+      <artifactId>jettison</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.jcip</groupId>
+      <artifactId>jcip-annotations</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>io.mishmash.apache.hadoop</groupId>
+      <artifactId>stable</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>    
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.8.1</version>
+        <executions>
+          <execution>
+            <id>unpack-patched-sources</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>patched-sources</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/workdir</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>unpack-tests</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>io.mishmash.apache.hadoop</groupId>
+                  <artifactId>stable</artifactId>
+                  <version>${hadoop.version}</version>
+                  <classifier>tests</classifier>
+                  <overWrite>true</overWrite>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>3.1.0</version>
+        <executions>
+          <execution>
+            <id>create-log-dir</id>
+            <phase>process-test-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <target>
+                <!--
+                TODO: there are tests (TestLocalFileSystem#testCopy) that fail if data
+                TODO: from a previous run is present
+                -->
+                <delete dir="${test.build.data}"/>
+                <mkdir dir="${test.build.data}"/>
+                <mkdir dir="${hadoop.log.dir}"/>
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.5.0</version>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+          <forkCount>1</forkCount>
+          <reuseForks>false</reuseForks>
+          <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true -Dorg.apache.avro.SERIALIZABLE_PACKAGES=org.apache.hadoop.io,org.apache.hadoop.fs --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ${test.instrumentation.opts}</argLine>
+          <environmentVariables>
+            <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME>
+            <!-- HADOOP_HOME required for tests on Windows to find winutils -->
+            <HADOOP_HOME>${hadoop.common.build.dir}</HADOOP_HOME>
+            <LD_LIBRARY_PATH>${env.LD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</LD_LIBRARY_PATH>
+            <DYLD_LIBRARY_PATH>${env.DYLD_LIBRARY_PATH}:${project.build.directory}/native/target/usr/local/lib:${hadoop.common.build.dir}/native/target/usr/local/lib</DYLD_LIBRARY_PATH>
+            <MALLOC_ARENA_MAX>4</MALLOC_ARENA_MAX>
+
+            <!--
+              Disable the servlet instrumentation for now, because the TestAuthenticationFilter
+              uses Mockito.verifyNoMoreInteractions(<HttpServletResponse mocks>), and OpenTelemetry
+              does interact with HttpServletResponse(s).
+
+              Another solution might be to tell Otel to not instrument Mockito mocked classes, if it can recognize them
+            -->
+            <OTEL_INSTRUMENTATION_SERVLET_ENABLED>false</OTEL_INSTRUMENTATION_SERVLET_ENABLED>
+            <OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>false</OTEL_INSTRUMENTATION_LOG4J_APPENDER_ENABLED>
+          </environmentVariables>
+          <systemPropertyVariables>
+            <hadoop.log.dir>${hadoop.log.dir}</hadoop.log.dir>
+            <hadoop.tmp.dir>${hadoop.tmp.dir}</hadoop.tmp.dir>
+
+            <test.build.dir>${test.build.dir}</test.build.dir>
+            <test.build.data>${test.build.data}</test.build.data>
+            <test.build.webapps>${test.build.webapps}</test.build.webapps>
+            <test.cache.data>${test.cache.data}</test.cache.data>
+            <test.build.classes>${project.build.directory}/test-classes</test.build.classes>
+
+            <java.security.krb5.conf>${project.build.directory}/test-classes/krb5.conf</java.security.krb5.conf>
+            <java.security.egd>${java.security.egd}</java.security.egd>
+            <!--require.test.libhadoop>${require.test.libhadoop}</require.test.libhadoop-->
+
+            <java.util.logging.manager>org.apache.logging.log4j.jul.LogManager</java.util.logging.manager>
+          </systemPropertyVariables>
+          <properties>
+            <!-- set a default timeout of 10 minutes to all tests -->
+            <configurationParameters>
+              junit.jupiter.execution.timeout.default = 10m
+            </configurationParameters>
+          </properties>
+          <workingDirectory>${project.build.directory}/workdir/hadoop-common-project/hadoop-common</workingDirectory>
+          <includes>
+            **/hadoop/hdfs/server/namenode/**
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>