Commit 91d69338 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Merge branch 'rnou/268-remove-parallax-testing' into 'master' 

Resolve "Remove Parallax Testing"

This MR updates testing for the new docker CI environment:
- Removes Parallax Testing to make faster tests (we will activate again if needed, or changes are applied)
- Adds cstdint for uint types (gcc 10..)
- Updates python sh library/package to a newer version. This solves and produces some changes.
- Solved a bug in sfind

Closes #268

Closes #268

See merge request !169
parents 2730a9ce 1ecefdf4

CMake/FindMercury.cmake

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ endmacro() 


include(SelectLibraryConfigurations)



set(_mercury_components na mchecksum mercury_util mercury_hl)

set(_mercury_components na mercury_util mercury_hl)



# prevent repeating work if the main CMakeLists.txt already called

# find_package(PkgConfig)

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ endif() 
if(GKFS_ENABLE_ROCKSDB)

    message(STATUS "[${PROJECT_NAME}] Checking for RocksDB")

    add_compile_definitions(GKFS_ENABLE_ROCKSDB)

    find_package(RocksDB 6.26.1 REQUIRED)

    find_package(RocksDB REQUIRED)

    message(STATUS "[${PROJECT_NAME}] RocksDB version ${RocksDB_VERSION}")

    message(STATUS "[${PROJECT_NAME}] RocksDB location ${RocksDB_DIR}")

endif()

CMakePresets.json

+4 −2
Original line number Diff line number Diff line
@@ -79,12 +79,14 @@ 
      "cacheVariables": {

        "CMAKE_INSTALL_PREFIX": "${sourceDir}/gkfs/install",

        "GKFS_USE_GUIDED_DISTRIBUTION": true,

        "GKFS_ENABLE_PARALLAX": true,

        "GKFS_ENABLE_PARALLAX": false,

        "GKFS_BUILD_TESTS": true,

        "GKFS_INSTALL_TESTS": true,

        "GKFS_CHUNK_STATS": true,

        "GKFS_ENABLE_PROMETHEUS": true,

        "GKFS_RENAME_SUPPORT": true

        "GKFS_RENAME_SUPPORT": true,

        "MAX_OPEN_FDS": "10000",

        "MAX_INTERNAL_FDS": "1024"

      }

    },

    {

examples/gfind/gfind.cpp

+2 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <sys/types.h>

#include <unistd.h>

#include <limits>

#include <cstdint>



using namespace std;
@@ -114,7 +115,7 @@ static void pfind_print_help(pfind_options_t *res) { 
         "\tworkdir = \"%s\"\n"

         "\t-newer = \"%s\"\n"

         "\t-name|-regex = \"%s\"\n"

         "\t-S: num servers = \"%s\"\n"

         "\t-S: num servers = \"%d\"\n"

         "\t-M: mountdir = \"%s\"\n"

         "Optional flags\n"

         "\t-h: prints the help\n"

examples/gfind/sfind.cpp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <sys/types.h>

#include <unistd.h>

#include <limits>

#include <cstdint>



using namespace std;