Merge pull request #218 from liulanzheng/main

update photon to v0.6.1 and fix zfile open

Author: yuchen0cc

.github/workflows/release/build.sh

@@ -29,7 +29,7 @@ if [[ ${OS} =~ "ubuntu" ]]; then
     export DEBIAN_FRONTEND="noninteractive"
     export TZ="Etc/UTC"
     apt-get update -y
-    apt-get install -y libgflags-dev libcurl4-openssl-dev libssl-dev libaio-dev libnl-3-dev libnl-genl-3-dev rpm wget make g++ git dpkg-dev sudo
+    apt-get install -y libgflags-dev libcurl4-openssl-dev libssl-dev libaio-dev libnl-3-dev libnl-genl-3-dev rpm wget make g++ git dpkg-dev sudo pkg-config
     apt-get install -y uuid-dev libjson-c-dev libkmod-dev libsystemd-dev autoconf automake libtool libpci-dev nasm libzstd-dev libext2fs-dev zlib1g-dev
 
     DISTRO=${OS/:/1~}

CMake/Findphoton.cmake

@@ -4,7 +4,7 @@ set(FETCHCONTENT_QUIET false)
 FetchContent_Declare(
   photon
   GIT_REPOSITORY https://github.com/alibaba/PhotonLibOS.git
-  GIT_TAG v0.5.7
+  GIT_TAG v0.6.1
 )
 
 if(BUILD_TESTING)

src/overlaybd/cache/download_cache/download_cache.cpp

@@ -27,7 +27,7 @@
 #include <photon/thread/thread.h>
 #include <photon/common/io-alloc.h>
 #include <photon/common/expirecontainer.h>
-#include "thread_range_lock.h"
+#include <photon/common/range-lock.h>
 
 #define SET_LOCAL_DIR 118
 #define SET_SIZE 119
@@ -50,7 +50,7 @@ class DownloadCacheStore : public ForwardFile_Ownership {
     using ForwardFile_Ownership::pwritev;
 
     int fallocate(int mode, off_t offset, off_t len) override {
-        ThreadScopedRangeLock lock(m_range_lock, offset, len);
+        ScopedRangeLock lock(m_range_lock, offset, len);
         return m_file->fallocate(mode, offset, len);
     }
     int ftruncate(off_t length) override {
@@ -64,14 +64,14 @@ class DownloadCacheStore : public ForwardFile_Ownership {
         return m_range_lock.try_lock_wait(offset, length);
     }
     void lock(uint64_t offset, uint64_t length) {
-        return m_range_lock.lock(offset, length);
+        m_range_lock.lock(offset, length);
     }
     void unlock(uint64_t offset, uint64_t length) {
         m_range_lock.unlock(offset, length);
     }
 
 private:
-    ThreadRangeLock m_range_lock;
+    RangeLock m_range_lock;
     DownloadCacheFs *m_fs;
 };
 

src/overlaybd/cache/download_cache/thread_range_lock.h

@@ -161,6 +161,7 @@ int FileCacheStore::evict(off_t offset, size_t count) {
 #ifndef FALLOC_FL_PUNCH_HOLE
 #define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */
 #endif
+        ScopedRangeLock lock(rangeLock_, offset, count);
         int mode = FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE;
         return localFile_->fallocate(mode, offset, count);
     }

src/overlaybd/cache/full_file_cache/cache_store.cpp

@@ -142,7 +142,7 @@ class OcfNamespaceOnFs : public OcfNamespace {
             .info = info,
         };
 
-        auto tmp_file_path = file_path + ".tmp";
+        auto tmp_file_path = estring().appends(file_path, ".tmp");
         {
             auto tmp_file = m_fs->open(tmp_file_path.c_str(), O_WRONLY | O_TRUNC | O_CREAT, 0644);
             if (tmp_file == nullptr) {

src/overlaybd/cache/ocf_cache/ocf_namespace.cpp

@@ -232,7 +232,7 @@ static int single_file_file_cache(IOAlloc *io_alloc, photon::fs::IFileSystem *sr
 
     estring filename = FLAGS_src_file;
     if (!filename.starts_with("/")) {
-        filename = "/" + filename;
+        filename = estring().appends("/", filename);
     }
 
     auto file = cached_fs->open(filename.c_str(), O_RDONLY, 0644);

src/overlaybd/cache/ocf_cache/test/ocf_perf_test.cpp

@@ -127,7 +127,7 @@ class RegistryFSImpl : public RegistryFS {
         //use p2p proxy
         estring accelerate_url;
         if (m_accelerate.size() > 0) {
-            accelerate_url = m_accelerate + "/" + actual_url;
+            accelerate_url = estring().appends(m_accelerate, "/", estring(actual_url));
             actual_url = accelerate_url.data();
             LOG_DEBUG("p2p_url: `", actual_url);
         }
@@ -365,8 +365,8 @@ class RegistryFSImpl : public RegistryFS {
                              challengeLine);
         }
         *scope = estring(kv["scope"]);
-        *auth_url = estring(kv["realm"]) + "?service=" + estring(kv["service"]) +
-                    "&scope=" + estring(kv["scope"]);
+        *auth_url = estring().appends(kv["realm"], "?service=", kv["service"],
+                    "&scope=", kv["scope"]);
         return true;
     }
 }; // namespace FileSystem
@@ -520,4 +520,3 @@ IFileSystem *new_registryfs_v1(PasswordCB callback, const char *caFile,
         LOG_ERROR_RETURN(EINVAL, nullptr, "password callback not set");
     return new RegistryFSImpl(callback, caFile ? caFile : "", timeout);
 }
-

src/overlaybd/registryfs/registryfs.cpp

@@ -130,7 +130,7 @@ class RegistryFSImpl_v2 : public RegistryFS {
         //use p2p proxy
         estring accelerate_url;
         if(m_accelerate.size() > 0) {
-            accelerate_url = m_accelerate + "/" + *actual_url;
+            accelerate_url = estring().appends(m_accelerate, "/", *actual_url);
             actual_url = &accelerate_url;
             LOG_DEBUG("p2p_url: `", *actual_url);
         }
@@ -280,8 +280,8 @@ class RegistryFSImpl_v2 : public RegistryFS {
                              challengeLine);
         }
         *scope = estring(kv["scope"]);
-        *authurl = estring(kv["realm"]) + "?service=" + estring(kv["service"]) +
-                    "&scope=" + estring(kv["scope"]);
+        *authurl = estring().appends(kv["realm"], "?service=", kv["service"],
+                    "&scope=", kv["scope"]);
         return 0;
     }
 

src/overlaybd/registryfs/registryfs_v2.cpp

@@ -678,6 +678,9 @@ bool load_jump_table(IFile *file, CompressionFile::HeaderTrailer *pheader_traile
     auto ibuf = std::unique_ptr<uint32_t[]>(new uint32_t[pht->index_size]);
     LOG_DEBUG("index_offset: `", pht->index_offset);
     ret = file->pread((void *)(ibuf.get()), index_bytes, pht->index_offset);
+    if (ret < index_bytes) {
+        LOG_ERRNO_RETURN(0, false, "failed to read index");
+    }
     jump_table.build(ibuf.get(), pht->index_size,
                      CompressionFile::HeaderTrailer::SPACE + pht->opt.dict_size,
                      pht->opt.block_size);