[POAE7-984] Upgrade hadoop dependencies in HCFS (#63)

oap-project · Mar 30, 2021 · 597f260 · 597f260
1 parent 35be456
commit 597f260
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/HCFS-based-cache/pom.xml b/HCFS-based-cache/pom.xml
@@ -27,7 +27,7 @@
   <packaging>jar</packaging>
 
   <properties>
-    <hadoop.version>2.4.1</hadoop.version>
+    <hadoop.version>3.2.2</hadoop.version>
   </properties>
 
   <dependencies>
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-hdfs</artifactId>
+      <artifactId>hadoop-hdfs-client</artifactId>
       <version>${hadoop.version}</version>
     </dependency>
     <dependency>

diff --git a/...che/src/main/java/com/intel/oap/fs/hadoop/cachedfs/redis/RedisPMemBlockLocationStore.java b/...che/src/main/java/com/intel/oap/fs/hadoop/cachedfs/redis/RedisPMemBlockLocationStore.java
@@ -200,7 +200,10 @@ private PMemBlockLocation filterLocationInfo(PMemBlock block, Set<Tuple> locatio
                 if (parts.length >= 3) {
                     long offset = Long.parseLong(parts[0]);
                     long length = Long.parseLong(parts[1]);
-                    String host = parts[2];
+                    // hostname may contains delimiter. So we don't use parts[2] as hostname.
+                    String host = t.getElement().substring(
+                            parts[0].length() + parts[1].length()
+                                    + 2 * REDIS_ZSET_VALUE_DELIM.length());
 
                     // check cached block's offset and length
                     if (offset == block.getOffset() && length == block.getLength()) {