Merge pull request #8563 from shirady/backport-into-5_16

[Backport into 5.16] Removing `unique` and the unused `NAN_SET_BUF_DETACH`
noobaa · Nov 28, 2024 · 7279d56 · 7279d56
2 parents 90b1cf4 + 884531c
commit 7279d56
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/src/native/util/buf.h b/src/native/util/buf.h
@@ -167,12 +167,6 @@ class Buf
         return _alloc->detach();
     }
 
-    inline bool
-    unique_alloc()
-    {
-        return _alloc.unique();
-    }
-
     inline bool
     same(const Buf& buf) const
     {

diff --git a/src/native/util/nan.h b/src/native/util/nan.h
@@ -71,12 +71,6 @@ NanKey(std::string s)
 #define NAN_SET_NUM(obj, key, val) (NAN_SET(obj, key, Nan::New<v8::Number>(val)))
 #define NAN_SET_BUF_COPY(obj, key, buf) \
     (NAN_SET(obj, key, Nan::CopyBuffer(buf.cdata(), buf.length()).ToLocalChecked()))
-#define NAN_SET_BUF_DETACH(obj, key, buf)                                              \
-    do {                                                                               \
-        assert(buf.unique_alloc());                                                    \
-        NAN_SET(obj, key, Nan::NewBuffer(buf.cdata(), buf.length()).ToLocalChecked()); \
-        buf.detach_alloc();                                                            \
-    } while (0)
 
 #define NAN_ERR(msg) (Nan::To<v8::Object>(Nan::Error(msg)).ToLocalChecked())
 #define NAN_RETURN(val)                 \

diff --git a/src/test/system_tests/ceph_s3_tests/test_ceph_s3_deploy.sh b/src/test/system_tests/ceph_s3_tests/test_ceph_s3_deploy.sh
@@ -38,7 +38,7 @@ commit_epoch=$(git show -s --format=%ci ${CEPH_TESTS_VERSION} | awk '{print $1}'
 commit_date=$(date -d ${commit_epoch} +%s)
 current_date=$(date +%s)
 
-max_days="360"
+max_days="540"
 if [ $((current_date-commit_date)) -gt $((3600*24*${max_days})) ]
 then
     echo "ceph tests were not updated for ${max_days} days, Exiting"