[Services] Update backup CMake
ClosedPublic
Actions

Authored by • jon on Jul 8 2022, 11:00 PM.

Details

Reviewers

• max
• karol
atul

Commits

rCOMM682bd637b664: [Services] Update backup CMake

Summary

Make backup more nix friendly
Allow backup to be built outside of docker

Also moved Item.h to shared lib

Test Plan

nix develop
cd services/backup && mkdir build && cd build && cmake .. && make

docker workflow:

cd services/base-image
docker build -t commapp/services-base . -f Dockerfile

cd ../..
docker build . -f services/backup/Dockerfile

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• jon created this revision.Jul 8 2022, 11:00 PM

Herald added subscribers: • abosh, atul, • adrian and 2 others. · View Herald TranscriptJul 8 2022, 11:00 PM

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 8 2022, 11:02 PM

Harbormaster failed remote builds in B10435: Diff 14379!

Rebase

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 25 2022, 9:06 PM

Harbormaster failed remote builds in B10844: Diff 14907!

• jon added a parent revision: D4493: [Services] Update blob CMake project.Jul 26 2022, 8:24 AM

Clean up backup cmake and docker build

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 29 2022, 3:05 PM

Harbormaster failed remote builds in B10986: Diff 15120!

• jon requested review of this revision.Jul 29 2022, 4:07 PM

• jon edited the test plan for this revision. (Show Details)

• jon added a reviewer: atul.

• jon retitled this revision from [Services] Export backup as CMake project to [Services] Update backup CMake.

• jon edited the summary of this revision. (Show Details)

cd services/base-image
docker build -t commapp/services-base . -f Dockerfile

cd ../..
docker build . -f services/backup/Dockerfile

Confirmed that this worked locally for me

This revision is now accepted and ready to land.Aug 1 2022, 10:04 AM

Update base-image tag

Harbormaster failed remote builds in B11025: Diff 15166!Aug 1 2022, 12:51 PM

rebase with lint fixes

Harbormaster completed remote builds in B11034: Diff 15175.Aug 1 2022, 1:37 PM

• jon mentioned this in D4492: [Services] Export server-base-reactors as CMake Project.Aug 3 2022, 7:35 PM

• jon mentioned this in D4491: [Services] Export client-base-reactors as CMake Project.Aug 3 2022, 7:39 PM

• jon mentioned this in D4671: [Services] Update tunnelbroker Dockerfile & cmake.Aug 3 2022, 10:05 PM

• jon mentioned this in D4489: [Services] Export shared services cpp as CMake Project.Aug 3 2022, 10:09 PM

• jon mentioned this in D4493: [Services] Update blob CMake project.

• jon mentioned this in D4302: [services] Export generated code as CMake Project.Aug 3 2022, 10:35 PM

Rebase with fixes

Harbormaster completed remote builds in B11106: Diff 15297.Aug 3 2022, 11:37 PM

• jon added a child revision: D4735: [Services] Remove build_services compatibility logic.Aug 3 2022, 11:56 PM

• jon mentioned this in D4763: [Services] Allow backup to be built on MacOS.Aug 5 2022, 4:56 PM

• jon added a parent revision: D4763: [Services] Allow backup to be built on MacOS.Aug 5 2022, 4:56 PM

Rebase with MacOS fixes

Harbormaster completed remote builds in B11185: Diff 15392.Aug 5 2022, 5:28 PM

• jon mentioned this in rCOMMfd098d391542: [Services] Export server-base-reactors as CMake Project.Aug 8 2022, 11:34 AM

• jon mentioned this in rCOMM1b61e233ae98: [Services] Export client-base-reactors as CMake Project.

• jon mentioned this in rCOMMe2e9907eb4fc: [Services] Update tunnelbroker Dockerfile & cmake.

Merge MacOS fixes into this to ease review

Harbormaster completed remote builds in B11223: Diff 15441.Aug 8 2022, 11:56 AM

Closed by commit rCOMM682bd637b664: [Services] Update backup CMake (authored by • jon). · Explain WhyAug 8 2022, 1:45 PM

This revision was automatically updated to reflect the committed changes.

• jon mentioned this in rCOMM2d5c710211a1: [Services] Export shared services cpp as CMake Project.

• jon mentioned this in rCOMMc11d07fedc73: [Services] Update blob CMake project.

• jon added a commit: rCOMM682bd637b664: [Services] Update backup CMake.

Revision Contents
Changeset List

Path

Size

services/

backup/

CMakeLists.txt

77 lines

Dockerfile

14 lines

src/

BackupServiceImpl.h

4 lines

DatabaseEntities/

DatabaseEntitiesTools.h

DatabaseManager.h

2 lines

Reactors/

client/

blob/

BlobGetClientReactor.h

6 lines

server/

PullBackupReactor.h

6 lines

grpc-client/

ServiceBlobClient.h

4 lines

Diff 15392

View Options

services/backup/CMakeLists.txt

Show All 9 Lines

set(CMAKE_CXX_STANDARD 17)		set(CMAKE_CXX_STANDARD 17)
# For C++17 on MacOS, we must set minimum target to 10.14+		# For C++17 on MacOS, we must set minimum target to 10.14+
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)		set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)

set(BUILD_TESTING OFF CACHE BOOL "Turn off tests" FORCE)		set(BUILD_TESTING OFF CACHE BOOL "Turn off tests" FORCE)
set(WITH_GTEST "Use Google Test" OFF)		set(WITH_GTEST "Use Google Test" OFF)

# FIND LIBS		find_package(glog REQUIRED)
include(./cmake-components/grpc.cmake)		find_package(protobuf REQUIRED)
include(./cmake-components/folly.cmake)		find_package(gRPC REQUIRED)
add_subdirectory(./lib/glog)		find_package(Folly REQUIRED)
find_package(AWSSDK REQUIRED COMPONENTS core dynamodb)		find_package(AWSSDK REQUIRED COMPONENTS core dynamodb)
find_package(Boost 1.40 COMPONENTS program_options REQUIRED)		find_package(Boost 1.40
		COMPONENTS program_options context filesystem regex system thread
# FIND FILES		REQUIRED
file(GLOB DOUBLE_CONVERSION_SOURCES
"./lib/double-conversion/double-conversion/*.cc"
)		)

file(GLOB GENERATED_CODE "./_generated/*.cc")		if(${CMAKE_CURRENT_SOURCE_DIR} MATCHES "^\/transferred.*")
		# Inside the docker build contex
		set(_proto_path "grpc")
		else()
		# Inside repo
		set(_proto_path "../../native/cpp/CommonCpp/grpc")
		endif()

file(GLOB_RECURSE SOURCE_CODE "./src/*.cpp")		# Shared Comm protos
		add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/${_proto_path}
		${CMAKE_CURRENT_BINARY_DIR}/protos
		EXCLUDE_FROM_ALL
		)

include_directories(		add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../lib/src
./src		${CMAKE_CURRENT_BINARY_DIR}/lib/src
./src/client-base-reactors		EXCLUDE_FROM_ALL
./src/server-base-reactors
./src/grpc-client
./src/DatabaseEntities
./src/Reactors
./src/Reactors/server
./src/Reactors/server/base-reactors
./src/Reactors/client
./src/Reactors/client/blob
./src/Reactors/client/base-reactors
./_generated
${FOLLY_INCLUDES}
./lib/double-conversion
${Boost_INCLUDE_DIR}
)		)

		file(GLOB_RECURSE SOURCE_CODE "./src/*.cpp")

# SERVER		# SERVER
add_executable(		add_executable(
backup		backup

${GENERATED_CODE}		${GENERATED_CODE}
${DOUBLE_CONVERSION_SOURCES}
${FOLLY_SOURCES}		${FOLLY_SOURCES}

${SOURCE_CODE}		${SOURCE_CODE}
)		)

		target_include_directories(
		backup
		PUBLIC
		${CMAKE_CURRENT_SOURCE_DIR}/src
		${CMAKE_CURRENT_SOURCE_DIR}/src/grpc-client
		${CMAKE_CURRENT_SOURCE_DIR}/src/DatabaseEntities
		${CMAKE_CURRENT_SOURCE_DIR}/src/Reactors
		${CMAKE_CURRENT_SOURCE_DIR}/src/Reactors/server
		${CMAKE_CURRENT_SOURCE_DIR}/src/Reactors/server/base-reactors
		${CMAKE_CURRENT_SOURCE_DIR}/src/Reactors/client
		${CMAKE_CURRENT_SOURCE_DIR}/src/Reactors/client/blob
		${CMAKE_CURRENT_SOURCE_DIR}/src/Reactors/client/base-reactors

		${Boost_INCLUDE_DIR}
		)

set(		set(
LIBS		LIBS

${GRPC_LIBS}		${GRPC_LIBS}
${AWSSDK_LINK_LIBRARIES}		${AWSSDK_LINK_LIBRARIES}
${Boost_LIBRARIES}		${Boost_LIBRARIES}
glog::glog		glog::glog
		Folly::folly
		gRPC::grpc++

		comm-blob-grpc
		comm-backup-grpc
		comm-services-common
		comm-client-base-reactors
		comm-server-base-reactors
)		)

target_link_libraries(		target_link_libraries(
backup		backup

${LIBS}		${LIBS}
)		)

Show All 13 Lines	include_directories(
${GTEST_INCLUDE_DIR}		${GTEST_INCLUDE_DIR}
./test		./test
)		)

add_executable(		add_executable(
runTests		runTests

${GENERATED_CODE}		${GENERATED_CODE}
${DOUBLE_CONVERSION_SOURCES}
${FOLLY_SOURCES}		${FOLLY_SOURCES}
${SOURCE_CODE}		${SOURCE_CODE}
${TEST_CODE}		${TEST_CODE}
)		)
target_link_libraries(		target_link_libraries(
runTests		runTests

${LIBS}		${LIBS}
Show All 9 Lines

View Options

services/backup/Dockerfile

	FROM commapp/services-base:1.2			FROM commapp/services-base:1.3

	RUN apt-get update && \			RUN apt-get update && \
	apt-get install -y uuid-dev && \			apt-get install -y uuid-dev && \
	rm -rf /var/lib/apt/lists/*			rm -rf /var/lib/apt/lists/*

	ARG COMM_TEST_SERVICES			ARG COMM_TEST_SERVICES
	ARG COMM_SERVICES_SANDBOX			ARG COMM_SERVICES_SANDBOX

	ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}			ENV COMM_TEST_SERVICES=${COMM_TEST_SERVICES}
	ENV COMM_SERVICES_SANDBOX=${COMM_SERVICES_SANDBOX}			ENV COMM_SERVICES_SANDBOX=${COMM_SERVICES_SANDBOX}

	WORKDIR /transferred			WORKDIR /transferred

	COPY native/cpp/CommonCpp/grpc/protos/backup.proto native/cpp/CommonCpp/grpc/protos/blob.proto protos/			COPY services/backup/ backup/
	COPY services/lib/cmake-components cmake-components			COPY services/lib/src/ lib/src/

				WORKDIR /transferred/backup

				COPY native/cpp/CommonCpp/grpc grpc/
	COPY services/lib/docker/ scripts/			COPY services/lib/docker/ scripts/
	COPY services/backup/ .
	COPY services/lib/src/* src/

	RUN scripts/build_service.sh			RUN scripts/build_service.sh

				WORKDIR /transferred

	CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then scripts/run_tests.sh; else scripts/run_service.sh; fi			CMD if [ "$COMM_TEST_SERVICES" -eq 1 ]; then scripts/run_tests.sh; else scripts/run_service.sh; fi

View Options

services/backup/src/BackupServiceImpl.h

	#pragma once			#pragma once

	#include "../_generated/backup.grpc.pb.h"			#include <backup.grpc.pb.h>
	#include "../_generated/backup.pb.h"			#include <backup.pb.h>

	#include <grpcpp/grpcpp.h>			#include <grpcpp/grpcpp.h>

	namespace comm {			namespace comm {
	namespace network {			namespace network {

	class BackupServiceImpl final : public backup::BackupService::CallbackService {			class BackupServiceImpl final : public backup::BackupService::CallbackService {

	Show All 30 Lines