Commit e6b794d6 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'rnou/chunkremovetest' into 'master' 

chunk remove test

added test, and CREATE_EXIST_CHECK env

See merge request !290
parents 508faafe 242354fc

.gitmodules

+0 −3
Original line number Diff line number Diff line 
[submodule "external/hermes"]

	path = external/hermes

	url = https://github.com/gekkofs/hermes.git

[submodule "tests/scripts/bats"]

	path = tests/scripts/bats

	url = https://github.com/bats-core/bats-core.git

CMakeLists.txt

+1 −10
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ message(STATUS "[${PROJECT_NAME}] Build type: ${CMAKE_BUILD_TYPE}") 
# Compiler flags for various cmake build types

set(WARNINGS_FLAGS "-Wall -Wextra --pedantic -Wno-unused-parameter -Wno-missing-field-initializers")

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG -O3")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${WARNINGS_FLAGS} -g -O0 -DGKFS_DEBUG_BUILD -DHERMES_DEBUG_BUILD")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${WARNINGS_FLAGS} -g -O0 -DGKFS_DEBUG_BUILD")

set(CMAKE_CXX_FLAGS_MEMCHECK "${WARNINGS_FLAGS} -g -O0 -fsanitize=address -fno-omit-frame-pointer")

set(CMAKE_CXX_FLAGS_MAINTAINER "${WARNINGS_FLAGS} -g -O0 -pg -no-pie")

set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG -O3")
@@ -334,15 +334,6 @@ endif () 


configure_file(include/common/cmake_configure.hpp.in include/common/cmake_configure.hpp)



if (GKFS_ENABLE_CLIENT_LOG)

    option(HERMES_LOGGING "" ON)

    option(HERMES_LOGGING_FMT_USE_BUNDLED "" OFF)

    option(HERMES_LOGGING_FMT_HEADER_ONLY "" OFF)

endif ()



option(HERMES_MARGO_COMPATIBLE_RPCS "" ON)

add_subdirectory(external/hermes)

target_include_directories(hermes INTERFACE external/hermes/include)



set(INCLUDE_DIR "${CMAKE_SOURCE_DIR}/include")

CMakePresets.json

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
      "hidden": true,

      "cacheVariables": {

        "CMAKE_BUILD_TYPE": "Debug",

        "CMAKE_CXX_FLAGS": "-Wall -Wextra -fdiagnostics-color=always --pedantic -Wno-unused-parameter -Wno-missing-field-initializers -DGKFS_DEBUG_BUILD -DHERMES_DEBUG_BUILD"

        "CMAKE_CXX_FLAGS": "-Wall -Wextra -fdiagnostics-color=always --pedantic -Wno-unused-parameter -Wno-missing-field-initializers -DGKFS_DEBUG_BUILD"

      }

    },

    {

README.md

+1 −0
Original line number Diff line number Diff line
@@ -662,6 +662,7 @@ Using two environment variables 
### Daemon

#### Core

- `GKFS_DAEMON_CREATE_CHECK_PARENTS` - Enable checking parent directory for existence before creating children.

- `GKFS_DAEMON_CREATE_EXIST_CHECK` - Check for existence of file metadata before create in RocksDB.

- `GKFS_DAEMON_SYMLINK_SUPPORT` - Enable support for symbolic links.

- `GKFS_DAEMON_RENAME_SUPPORT` - Enable support for rename.

#### Logging

docs/sphinx/devs/coverage.md

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ Preset CMake variables: 


  CMAKE_BUILD_TYPE="Coverage"

  CMAKE_CXX_COMPILER="/usr/bin/g++"

  CMAKE_CXX_FLAGS="-Wall -Wextra -fdiagnostics-color=always --pedantic -Wno-unused-parameter -Wno-missing-field-initializers -DGKFS_DEBUG_BUILD -DHERMES_DEBUG_BUILD"

  CMAKE_CXX_FLAGS="-Wall -Wextra -fdiagnostics-color=always --pedantic -Wno-unused-parameter -Wno-missing-field-initializers -DGKFS_DEBUG_BUILD"

  CMAKE_CXX_FLAGS_COVERAGE="-Og -g --coverage -fkeep-static-functions"

  CMAKE_C_COMPILER="/usr/bin/gcc"

  CMAKE_C_FLAGS_COVERAGE="-Og -g --coverage -fkeep-static-functions"