Attachment #236370 for bug #266207




PORTNAME=	foundationdb-devel
DISTVERSION=	7.1.21
PORTREVISION=	2
CATEGORIES=	databases

# PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/

ONLY_FOR_ARCHS=	aarch64 amd64
ONLY_FOR_ARCHS_REASON=	not yet ported to anything else

BUILD_DEPENDS=	${LOCALBASE}/include/toml.hpp:devel/toml11 \
		${LOCALBASE}/include/toml.hpp:devel/toml11 \
		bash:shells/bash \
		git:devel/git

LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
		libeio.so:devel/libeio \
		libmsgpackc.so:devel/msgpack

USES=		cmake compiler:c++17-lang mono:build python:build shebangfix \
		ssl

Lines 1-3 Link Here

(-)b/databases/foundationdb-devel/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1640764452	1	TIMESTAMP = 1662218428
2	SHA256 (apple-foundationdb-7.0.0_GH0.tar.gz) = 9a5ef672e32b6976b04a20c013b28c4aeeb7d35456afdefbc552707d52bc31ca	2	SHA256 (apple-foundationdb-7.1.21_GH0.tar.gz) = 9579afbb6c18acc65dff323bbd1da7a3849e8b666989b6e0ba09be573d60f594
3	SIZE (apple-foundationdb-7.0.0_GH0.tar.gz) = 10875992	3	SIZE (apple-foundationdb-7.1.21_GH0.tar.gz) = 11651973




group = %%DB_GROUP%%

[general]
cluster-file = %%PREFIX%%/etc/foundationdb/fdb.cluster
# delete-envvars =
# kill-on-configuration-change = true
# disable-lifecycle-logging = false
restart-delay = 60
## by default, restart-backoff = restart-delay-reset-interval = restart-delay
# initial-restart-delay = 0
# restart-backoff = 60
# restart-delay-reset-interval = 60

## Default parameters for individual fdbserver processes
[fdbserver]
command = %%PREFIX%%/bin/fdbserver
public-address = auto:$ID
listen-address = public
datadir = %%DB_DIR%%/data/$ID
logdir = %%LOG_DIR%%
# logsize = 10MiB
# maxlogssize = 100MiB
# machine_id =
# datacenter_id =
# class =
# memory = 8GiB
# memory-vsize =
# storage-memory = 1GiB
# cache-memory = 2GiB
# locality-machineid =
# locality-zoneid =
# locality-data-hall =
# locality-dcid =
# io-trust-seconds = 20

## An individual fdbserver process with id 4500
## Parameters set here override defaults from the [fdbserver] section

Lines 1-6 Link Here

(-)b/databases/foundationdb-devel/files/patch-bindings_c_CMakeLists.txt (-2 / +2 lines)
1	--- bindings/c/CMakeLists.txt.orig 2021-12-29 13:15:46 UTC	1	--- bindings/c/CMakeLists.txt.orig
2	+++ bindings/c/CMakeLists.txt	2	+++ bindings/c/CMakeLists.txt
3	@@ -65,7 +65,7 @@ if(WIN32)	3	@@ -78,7 +78,7 @@
4	endif()	4	endif()
5		5
6	# The tests don't build on windows	6	# The tests don't build on windows




--- bindings/c/test/unit/third_party/CMakeLists.txt.orig	2021-12-07 03:03:34 UTC
+++ bindings/c/test/unit/third_party/CMakeLists.txt
@@ -1,18 +1 @@
-# Download doctest repo.
-include(ExternalProject)
-find_package(Git REQUIRED)
-
-ExternalProject_Add(
-    doctest
-    PREFIX ${CMAKE_BINARY_DIR}/doctest
-    GIT_REPOSITORY https://github.com/onqtam/doctest.git
-    GIT_TAG 1c8da00c978c19e00a434b2b1f854fcffc9fba35 # v2.4.0
-    TIMEOUT 10
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-    LOG_DOWNLOAD ON
-)
-
-ExternalProject_Get_Property(doctest source_dir)
-set(DOCTEST_INCLUDE_DIR ${source_dir}/doctest CACHE INTERNAL "Path to include folder for doctest")
+set(DOCTEST_INCLUDE_DIR %%LOCALBASE%%/include/doctest CACHE INTERNAL "Path to include folder for doctest")

Lines 1-11 Link Here

(-)b/databases/foundationdb-devel/files/patch-cmake_CompileBoost.cmake (-4 / +4 lines)
1	--- cmake/CompileBoost.cmake.orig 2022-04-19 01:08:48 UTC	1	--- cmake/CompileBoost.cmake.orig
2	+++ cmake/CompileBoost.cmake	2	+++ cmake/CompileBoost.cmake
3	@@ -113,7 +113,7 @@ endif()	3	@@ -113,7 +113,7 @@
4	return()	4	return()
5	endif()	5	endif()
6		6
7	-find_package(Boost 1.72.0 EXACT QUIET COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})	7	-find_package(Boost 1.78.0 EXACT QUIET COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})
8	+find_package(Boost 1.72.0 COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})	8	+find_package(Boost 1.78.0 COMPONENTS context CONFIG PATHS ${BOOST_HINT_PATHS})
9	set(FORCE_BOOST_BUILD OFF CACHE BOOL "Forces cmake to build boost and ignores any installed boost")	9	set(FORCE_BOOST_BUILD OFF CACHE BOOL "Forces cmake to build boost and ignores any installed boost")
10		10
11	if(Boost_FOUND AND NOT FORCE_BOOST_BUILD)	11	if(Boost_FOUND AND NOT FORCE_BOOST_BUILD)




--- cmake/FDBComponents.cmake.orig
+++ cmake/FDBComponents.cmake
@@ -24,7 +24,7 @@
 if(DISABLE_TLS)
   set(WITH_TLS OFF)
 else()
-  set(OPENSSL_USE_STATIC_LIBS TRUE)
+  set(OPENSSL_USE_STATIC_LIBS FALSE)
   if(WIN32)
     set(OPENSSL_MSVC_STATIC_RT ON)
   endif()
@@ -198,6 +198,13 @@
 endif()
 
 ################################################################################

 # Coroutine implementation
 ################################################################################
 
@@ -242,6 +249,8 @@
   message(STATUS "Build Documentation (make html):      ${WITH_DOCUMENTATION}")
   message(STATUS "Build Python sdist (make package):    ${WITH_PYTHON_BINDING}")
   message(STATUS "Configure CTest (depends on Python):  ${WITH_PYTHON}")
+  message(STATUS "Build contrib:                        ${WITH_CONTRIB}")
+  message(STATUS "Build with FlowBench:                 ${WITH_FLOWBENCH}")
   message(STATUS "Build with RocksDB:                   ${WITH_ROCKSDB_EXPERIMENTAL}")
   message(STATUS "Build with AWS SDK:                   ${WITH_AWS_BACKUP}")
   message(STATUS "=========================================")
 endfunction()

Added Link Here

(-)b/databases/foundationdb-devel/files/patch-fdbmonitor_CMakeLists.txt (+11 lines)
1	--- fdbmonitor/CMakeLists.txt.orig
2	+++ fdbmonitor/CMakeLists.txt
3	@@ -56,8 +56,3 @@
4	configure_file(${CMAKE_SOURCE_DIR}/contrib/generate_profile.sh
5	${CMAKE_BINARY_DIR}/contrib/generate_profile.sh)
6	endif()
7	-
8	-add_custom_target(generate_profile
9	- COMMAND ${CMAKE_BINARY_DIR}/contrib/generate_profile.sh ${CMAKE_BINARY_DIR})
10	-
11	-add_dependencies(generate_profile fdbmonitor fdbserver mako fdbcli)




--- fdbserver/FDBExecHelper.actor.cpp.orig
+++ fdbserver/FDBExecHelper.actor.cpp
@@ -18,6 +18,14 @@
  * limitations under the License.
  */
 
+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
+#define BOOST_SYSTEM_NO_LIB
+#define BOOST_DATE_TIME_NO_LIB
+#define BOOST_REGEX_NO_LIB
+#include <boost/process.hpp>
+#endif
+#include <boost/algorithm/string.hpp>
+
 #include "flow/TLSConfig.actor.h"
 #include "flow/Trace.h"
 #include "flow/Platform.h"
@@ -33,14 +41,6 @@
 #include "fdbserver/FDBExecHelper.actor.h"
 #include "fdbserver/Knobs.h"
 #include "fdbserver/RemoteIKeyValueStore.actor.h"
-
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
-#define BOOST_SYSTEM_NO_LIB
-#define BOOST_DATE_TIME_NO_LIB
-#define BOOST_REGEX_NO_LIB
-#include <boost/process.hpp>
-#endif
-#include <boost/algorithm/string.hpp>
 
 #include "flow/actorcompiler.h" // This must be the last #include.
 




--- fdbserver/fdbserver.actor.cpp.orig
+++ fdbserver/fdbserver.actor.cpp
@@ -84,7 +84,11 @@
 #if defined(__linux__) || defined(__FreeBSD__)
 #include <execinfo.h>
 #include <signal.h>
+#if defined(__linux__)
 #include <sys/prctl.h>
+#elif defined(__FreeBSD__)
+#include <sys/procctl.h>
+#endif
 #ifdef ALLOC_INSTRUMENTATION
 #include <cxxabi.h>
 #endif
@@ -2225,9 +2229,14 @@
 			f = result;
 		} else if (role == ServerRole::FlowProcess) {
 			TraceEvent(SevDebug, "StartingFlowProcess").detail("From", "fdbserver");
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__)
 			prctl(PR_SET_PDEATHSIG, SIGTERM);
 			if (getppid() == 1) /* parent already died before prctl */
+				flushAndExit(FDB_EXIT_SUCCESS);
+#elif defined(__FreeBSD__)
+			const int sig = SIGTERM;
+			procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void*)&sig);
+			if (getppid() == 1) /* parent already died before procctl */
 				flushAndExit(FDB_EXIT_SUCCESS);
 #endif
 

Return to bug 266207

Lines 1-6 Link Here

(-)b/databases/foundationdb-devel/Makefile (-5 / +4 lines)
1	PORTNAME= foundationdb-devel	1	PORTNAME= foundationdb-devel
2	DISTVERSION= 7.0.0	2	DISTVERSION= 7.1.21
3	PORTREVISION= 2
4	CATEGORIES= databases	3	CATEGORIES= databases
5		4
6	# PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/	5	# PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/
Lines 14-26 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
14	ONLY_FOR_ARCHS= aarch64 amd64	13	ONLY_FOR_ARCHS= aarch64 amd64
15	ONLY_FOR_ARCHS_REASON= not yet ported to anything else	14	ONLY_FOR_ARCHS_REASON= not yet ported to anything else
16		15
17	BUILD_DEPENDS= ${LOCALBASE}/include/doctest/doctest.h:devel/doctest \	16	BUILD_DEPENDS= ${LOCALBASE}/include/toml.hpp:devel/toml11 \
18	${LOCALBASE}/include/toml.hpp:devel/toml11 \
19	bash:shells/bash \	17	bash:shells/bash \
20	git:devel/git	18	git:devel/git
21		19
22	LIB_DEPENDS= libboost_system.so:devel/boost-libs \	20	LIB_DEPENDS= libboost_system.so:devel/boost-libs \
23	libeio.so:devel/libeio	21	libeio.so:devel/libeio \
		22	libmsgpackc.so:devel/msgpack
24		23
25	USES= cmake compiler:c++17-lang mono:build python:build shebangfix \	24	USES= cmake compiler:c++17-lang mono:build python:build shebangfix \
26	ssl	25	ssl

Lines 9-40 user = %%DB_USER%% Link Here

(-)b/databases/foundationdb-devel/files/foundationdb.conf.in (-16 / +19 lines)
9	group = %%DB_GROUP%%	9	group = %%DB_GROUP%%
10		10
11	[general]	11	[general]
12	restart_delay = 60	12	cluster-file = %%PREFIX%%/etc/foundationdb/fdb.cluster
13	## by default, restart_backoff = restart_delay_reset_interval = restart_delay	13	# delete-envvars =
14	# initial_restart_delay = 0	14	# kill-on-configuration-change = true
15	# restart_backoff = 60	15	# disable-lifecycle-logging = false
16	# restart_delay_reset_interval = 60	16	restart-delay = 60
17	cluster_file = %%PREFIX%%/etc/foundationdb/fdb.cluster	17	## by default, restart-backoff = restart-delay-reset-interval = restart-delay
18	# delete_envvars =	18	# initial-restart-delay = 0
19	# kill_on_configuration_change = true	19	# restart-backoff = 60
		20	# restart-delay-reset-interval = 60
20		21
21	## Default parameters for individual fdbserver processes	22	## Default parameters for individual fdbserver processes
22	[fdbserver]	23	[fdbserver]
23	command = %%PREFIX%%/bin/fdbserver	24	command = %%PREFIX%%/bin/fdbserver
24	public_address = auto:$ID	25	public-address = auto:$ID
25	listen_address = public	26	listen-address = public
26	datadir = %%DB_DIR%%/data/$ID	27	datadir = %%DB_DIR%%/data/$ID
27	logdir = %%LOG_DIR%%	28	logdir = %%LOG_DIR%%
28	# logsize = 10MiB	29	# logsize = 10MiB
29	# maxlogssize = 100MiB	30	# maxlogssize = 100MiB
30	# machine_id =
31	# datacenter_id =
32	# class =	31	# class =
33	# memory = 8GiB	32	# memory = 8GiB
34	# storage_memory = 1GiB	33	# memory-vsize =
35	# cache_memory = 2GiB	34	# storage-memory = 1GiB
36	# metrics_cluster =	35	# cache-memory = 2GiB
37	# metrics_prefix =	36	# locality-machineid =
		37	# locality-zoneid =
		38	# locality-data-hall =
		39	# locality-dcid =
		40	# io-trust-seconds = 20
38		41
39	## An individual fdbserver process with id 4500	42	## An individual fdbserver process with id 4500
40	## Parameters set here override defaults from the [fdbserver] section	43	## Parameters set here override defaults from the [fdbserver] section

Removed Link Here

(-)a/databases/foundationdb-devel/files/patch-bindings_c_test_unit_third__party_CMakeLists.txt (-22 lines)
1	--- bindings/c/test/unit/third_party/CMakeLists.txt.orig 2021-12-07 03:03:34 UTC
2	+++ bindings/c/test/unit/third_party/CMakeLists.txt
3	@@ -1,18 +1 @@
4	-# Download doctest repo.
5	-include(ExternalProject)
6	-find_package(Git REQUIRED)
7	-
8	-ExternalProject_Add(
9	- doctest
10	- PREFIX ${CMAKE_BINARY_DIR}/doctest
11	- GIT_REPOSITORY https://github.com/onqtam/doctest.git
12	- GIT_TAG 1c8da00c978c19e00a434b2b1f854fcffc9fba35 # v2.4.0
13	- TIMEOUT 10
14	- CONFIGURE_COMMAND ""
15	- BUILD_COMMAND ""
16	- INSTALL_COMMAND ""
17	- LOG_DOWNLOAD ON
18	-)
19	-
20	-ExternalProject_Get_Property(doctest source_dir)
21	-set(DOCTEST_INCLUDE_DIR ${source_dir}/doctest CACHE INTERNAL "Path to include folder for doctest")
22	+set(DOCTEST_INCLUDE_DIR %%LOCALBASE%%/include/doctest CACHE INTERNAL "Path to include folder for doctest")

Lines 1-15 Link Here

(-)b/databases/foundationdb-devel/files/patch-cmake_FDBComponents.cmake (-8 / +8 lines)
1	--- cmake/FDBComponents.cmake.orig 2021-12-07 03:03:34 UTC	1	--- cmake/FDBComponents.cmake.orig
2	+++ cmake/FDBComponents.cmake	2	+++ cmake/FDBComponents.cmake
3	@@ -24,7 +24,7 @@ set(DISABLE_TLS OFF CACHE BOOL "Don't try to find Open	3	@@ -24,7 +24,7 @@
4	if(DISABLE_TLS)	4	if(DISABLE_TLS)
5	set(WITH_TLS OFF)	5	set(WITH_TLS OFF)
6	else()	6	else()
7	- set(OPENSSL_USE_STATIC_LIBS TRUE)	7	- set(OPENSSL_USE_STATIC_LIBS TRUE)
8	+ set(OPENSSL_USE_STATIC_LIBS FALSE)	8	+ set(OPENSSL_USE_STATIC_LIBS FALSE)
9	find_package(OpenSSL)	9	if(WIN32)
10	if(OPENSSL_FOUND)	10	set(OPENSSL_MSVC_STATIC_RT ON)
11	set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})	11	endif()
12	@@ -203,6 +203,13 @@ else()	12	@@ -198,6 +198,13 @@
13	endif()	13	endif()
14		14
15	################################################################################	15	################################################################################
Lines 23-34 Link Here
23	# Coroutine implementation	23	# Coroutine implementation
24	################################################################################	24	################################################################################
25		25
26	@@ -236,6 +243,8 @@ function(print_components)	26	@@ -242,6 +249,8 @@
27	message(STATUS "Build Documentation (make html): ${WITH_DOCUMENTATION}")	27	message(STATUS "Build Documentation (make html): ${WITH_DOCUMENTATION}")
28	message(STATUS "Build Python sdist (make package): ${WITH_PYTHON_BINDING}")	28	message(STATUS "Build Python sdist (make package): ${WITH_PYTHON_BINDING}")
29	message(STATUS "Configure CTest (depends on Python): ${WITH_PYTHON}")	29	message(STATUS "Configure CTest (depends on Python): ${WITH_PYTHON}")
30	+ message(STATUS "Build contrib: ${WITH_CONTRIB}")	30	+ message(STATUS "Build contrib: ${WITH_CONTRIB}")
31	+ message(STATUS "Build with FlowBench: ${WITH_FLOWBENCH}")	31	+ message(STATUS "Build with FlowBench: ${WITH_FLOWBENCH}")
32	message(STATUS "Build with RocksDB: ${WITH_ROCKSDB_EXPERIMENTAL}")	32	message(STATUS "Build with RocksDB: ${WITH_ROCKSDB_EXPERIMENTAL}")
		33	message(STATUS "Build with AWS SDK: ${WITH_AWS_BACKUP}")
33	message(STATUS "=========================================")	34	message(STATUS "=========================================")
34	endfunction()

Added Link Here

(-)b/databases/foundationdb-devel/files/patch-fdbserver_FDBExecHelper.actor.cpp (+32 lines)
1	--- fdbserver/FDBExecHelper.actor.cpp.orig
2	+++ fdbserver/FDBExecHelper.actor.cpp
3	@@ -18,6 +18,14 @@
4	* limitations under the License.
5	*/
6
7	+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
8	+#define BOOST_SYSTEM_NO_LIB
9	+#define BOOST_DATE_TIME_NO_LIB
10	+#define BOOST_REGEX_NO_LIB
11	+#include <boost/process.hpp>
12	+#endif
13	+#include <boost/algorithm/string.hpp>
14	+
15	#include "flow/TLSConfig.actor.h"
16	#include "flow/Trace.h"
17	#include "flow/Platform.h"
18	@@ -33,14 +41,6 @@
19	#include "fdbserver/FDBExecHelper.actor.h"
20	#include "fdbserver/Knobs.h"
21	#include "fdbserver/RemoteIKeyValueStore.actor.h"
22	-
23	-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__INTEL_COMPILER)
24	-#define BOOST_SYSTEM_NO_LIB
25	-#define BOOST_DATE_TIME_NO_LIB
26	-#define BOOST_REGEX_NO_LIB
27	-#include <boost/process.hpp>
28	-#endif
29	-#include <boost/algorithm/string.hpp>
30
31	#include "flow/actorcompiler.h" // This must be the last #include.
32

Added Link Here

(-)b/databases/foundationdb-devel/files/patch-fdbserver_fdbserver.actor.cpp (+30 lines)
1	--- fdbserver/fdbserver.actor.cpp.orig
2	+++ fdbserver/fdbserver.actor.cpp
3	@@ -84,7 +84,11 @@
4	#if defined(__linux__) \|\| defined(__FreeBSD__)
5	#include <execinfo.h>
6	#include <signal.h>
7	+#if defined(__linux__)
8	#include <sys/prctl.h>
9	+#elif defined(__FreeBSD__)
10	+#include <sys/procctl.h>
11	+#endif
12	#ifdef ALLOC_INSTRUMENTATION
13	#include <cxxabi.h>
14	#endif
15	@@ -2225,9 +2229,14 @@
16	f = result;
17	} else if (role == ServerRole::FlowProcess) {
18	TraceEvent(SevDebug, "StartingFlowProcess").detail("From", "fdbserver");
19	-#if defined(__linux__) \|\| defined(__FreeBSD__)
20	+#if defined(__linux__)
21	prctl(PR_SET_PDEATHSIG, SIGTERM);
22	if (getppid() == 1) /* parent already died before prctl */
23	+ flushAndExit(FDB_EXIT_SUCCESS);
24	+#elif defined(__FreeBSD__)
25	+ const int sig = SIGTERM;
26	+ procctl(P_PID, 0, PROC_PDEATHSIG_CTL, (void*)&sig);
27	+ if (getppid() == 1) /* parent already died before procctl */
28	flushAndExit(FDB_EXIT_SUCCESS);
29	#endif
30