From a7ce7428fc6ca3edff0f348f7e89e69778630071 Mon Sep 17 00:00:00 2001
From: Samir Farhat <sfarhatd@meta.com>
Date: Wed, 1 Apr 2026 13:18:24 -0700
Subject: [PATCH] Installation to be compatible with edge hosts (#549)

Summary:

non public Buck file through which we ensure open source contributions are able to be consumed for our fbpkg's and conveyors. Also install script wll now work for internal meta and edge hosts

Differential Revision: D98313798
---
 packages/cdn_bench/install_cdn_bench.sh | 156 ++++++++++++++----------
 1 file changed, 89 insertions(+), 67 deletions(-)

diff --git a/packages/cdn_bench/install_cdn_bench.sh b/packages/cdn_bench/install_cdn_bench.sh
index eba5367d..880a43c9 100755
--- a/packages/cdn_bench/install_cdn_bench.sh
+++ b/packages/cdn_bench/install_cdn_bench.sh
@@ -6,8 +6,8 @@
 
 # Install script for the CDN Benchmark (foss_revproxy).
 #
-# Builds proxygen and all dependencies from source, then builds the
-# foss_revproxy binaries (traffic_client, proxy_server, content_server).
+# Internal (Meta):  Binaries available by packaging in BUCK path_actions
+# External (OSS):   Builds proxygen and foss_revproxy from source.
 #
 # Binaries are installed to benchmarks/cdn_bench/ relative to BENCHPRESS_ROOT.
 
@@ -38,9 +38,28 @@ is_meta_internal() {
 }
 
 ##############################################################################
-# Ensure prerequisites (git, internet) are available
+# Internal install: binaries are pre-bundled in the cea.chips.benchpress fbpkg
 ##############################################################################
-ensure_prerequisites() {
+install_internal() {
+  echo -e "${COLOR_GREEN}[ INFO ] Meta internal — using pre-bundled binaries from benchpress fbpkg${COLOR_OFF}"
+  # The binaries are placed at benchmarks/cdn_bench/ by the fbpkg path_actions.
+  for bin in traffic_client proxy_server content_server; do
+    if [ ! -f "${INSTALL_DIR}/${bin}" ]; then
+      echo -e "${COLOR_RED}[ ERROR ] Expected pre-bundled binary not found: ${INSTALL_DIR}/${bin}${COLOR_OFF}"
+      echo -e "${COLOR_RED}[ ERROR ] Pre-bundled binaries missing. Ensure you are running from a cea.chips.benchpress fbpkg that includes cdn_bench targets.${COLOR_OFF}"
+      exit 1
+    fi
+  done
+  chmod +x "${INSTALL_DIR}/traffic_client" "${INSTALL_DIR}/proxy_server" "${INSTALL_DIR}/content_server"
+  echo -e "${COLOR_GREEN}[ INFO ] Pre-bundled binaries verified at ${INSTALL_DIR}${COLOR_OFF}"
+}
+
+##############################################################################
+# External install: build from source
+##############################################################################
+install_external() {
+  echo -e "${COLOR_GREEN}[ INFO ] External install — building from source${COLOR_OFF}"
+
   if ! command -v git &>/dev/null; then
     echo -e "${COLOR_GREEN}[ INFO ] Installing git${COLOR_OFF}"
     if command -v dnf &>/dev/null; then
@@ -53,90 +72,93 @@ ensure_prerequisites() {
     fi
   fi
 
-  # On Meta edge hosts, enable outbound internet via the standard forward proxy
   if is_meta_internal; then
-    echo -e "TODO: Implement internal installation mechanism compatible with edge hosts(next diff)"
+    echo -e "${COLOR_RED}[ ERROR ] External source build should not be used internally — use install_internal() path${COLOR_OFF}"
+    exit 1
   fi
-}
-
-ensure_prerequisites
-
-echo -e "${COLOR_GREEN}=== CDN Benchmark Install ===${COLOR_OFF}"
-echo -e "${COLOR_GREEN}Package dir:    ${CDN_PACKAGE_DIR}${COLOR_OFF}"
-echo -e "${COLOR_GREEN}Build dir:      ${BUILD_DIR}${COLOR_OFF}"
-echo -e "${COLOR_GREEN}Install dir:    ${INSTALL_DIR}${COLOR_OFF}"
-echo -e "${COLOR_GREEN}Parallelism:    ${JOBS} jobs${COLOR_OFF}"
-
-# Check if already installed
-if [ -x "${INSTALL_DIR}/traffic_client" ] && \
-   [ -x "${INSTALL_DIR}/proxy_server" ] && \
-   [ -x "${INSTALL_DIR}/content_server" ]; then
-  echo -e "${COLOR_GREEN}CDN Benchmark binaries already installed, skipping build${COLOR_OFF}"
-  echo -e "${COLOR_GREEN}To force reinstall, run: rm -rf ${INSTALL_DIR}${COLOR_OFF}"
-  exit 0
-fi
-
-mkdir -p "${BUILD_DIR}" "${INSTALL_DIR}"
 
+  mkdir -p "${BUILD_DIR}" "${INSTALL_DIR}"
 ##############################################################################
-# Step 1: Clone proxygen at pinned version
+  # Step 1: Clone proxygen at pinned version
 ##############################################################################
-PROXYGEN_SRC="${BUILD_DIR}/proxygen"
-if [ ! -d "${PROXYGEN_SRC}" ]; then
-  echo -e "${COLOR_GREEN}[ INFO ] Cloning proxygen ${PROXYGEN_GIT_TAG}${COLOR_OFF}"
-  git clone --depth 1 --branch "${PROXYGEN_GIT_TAG}" \
-    "${PROXYGEN_GIT_REPO}" "${PROXYGEN_SRC}"
-else
-  echo -e "${COLOR_GREEN}[ INFO ] Proxygen source already present, skipping clone${COLOR_OFF}"
-fi
+  PROXYGEN_SRC="${BUILD_DIR}/proxygen"
+  if [ ! -d "${PROXYGEN_SRC}" ]; then
+    echo -e "${COLOR_GREEN}[ INFO ] Cloning proxygen ${PROXYGEN_GIT_TAG}${COLOR_OFF}"
+    git clone --depth 1 --branch "${PROXYGEN_GIT_TAG}" \
+      "${PROXYGEN_GIT_REPO}" "${PROXYGEN_SRC}"
+  else
+    echo -e "${COLOR_GREEN}[ INFO ] Proxygen source already present, skipping clone${COLOR_OFF}"
+  fi
 
 ##############################################################################
-# Step 2: Build proxygen and all dependencies
+  # Step 2: Build proxygen and all dependencies
 ##############################################################################
 DEPS_DIR="${BUILD_DIR}/deps"
-echo -e "${COLOR_GREEN}[ INFO ] Building proxygen and dependencies${COLOR_OFF}"
-bash "${CDN_PACKAGE_DIR}/build_proxygen.sh" \
-  -j "${JOBS}" \
-  --proxygen-dir "${PROXYGEN_SRC}" \
-  -p "${DEPS_DIR}"
+  echo -e "${COLOR_GREEN}[ INFO ] Building proxygen and dependencies${COLOR_OFF}"
+  bash "${CDN_PACKAGE_DIR}/build_proxygen.sh" \
+    -j "${JOBS}" \
+    --proxygen-dir "${PROXYGEN_SRC}" \
+    -p "${DEPS_DIR}"
 
 ##############################################################################
 # Step 3: Build foss_revproxy
 ##############################################################################
-FOSS_REVPROXY_SRC_DIR="${CDN_PACKAGE_DIR}/src"
+  FOSS_REVPROXY_SRC_DIR="${CDN_PACKAGE_DIR}/src"
 
-if [ ! -f "${FOSS_REVPROXY_SRC_DIR}/CMakeLists.txt" ]; then
-  echo -e "${COLOR_RED}[ ERROR ] CMakeLists.txt not found at: ${FOSS_REVPROXY_SRC_DIR}${COLOR_OFF}"
-  exit 1
-fi
+  if [ ! -f "${FOSS_REVPROXY_SRC_DIR}/CMakeLists.txt" ]; then
+    echo -e "${COLOR_RED}[ ERROR ] CMakeLists.txt not found at: ${FOSS_REVPROXY_SRC_DIR}${COLOR_OFF}"
+    exit 1
+  fi
 
-if [ ! -d "${FOSS_REVPROXY_SRC_DIR}/ti/foss_revproxy" ]; then
-  echo -e "${COLOR_RED}[ ERROR ] foss_revproxy source not found at: ${FOSS_REVPROXY_SRC_DIR}/ti/foss_revproxy${COLOR_OFF}"
-  exit 1
-fi
+  if [ ! -d "${FOSS_REVPROXY_SRC_DIR}/ti/foss_revproxy" ]; then
+    echo -e "${COLOR_RED}[ ERROR ] foss_revproxy source not found at: ${FOSS_REVPROXY_SRC_DIR}/ti/foss_revproxy${COLOR_OFF}"
+    exit 1
+  fi
 
-echo -e "${COLOR_GREEN}[ INFO ] Building foss_revproxy${COLOR_OFF}"
-FOSS_BUILD_DIR="${BUILD_DIR}/foss_revproxy_build"
-mkdir -p "${FOSS_BUILD_DIR}"
-cd "${FOSS_BUILD_DIR}"
+  echo -e "${COLOR_GREEN}[ INFO ] Building foss_revproxy${COLOR_OFF}"
+  FOSS_BUILD_DIR="${BUILD_DIR}/foss_revproxy_build"
+  mkdir -p "${FOSS_BUILD_DIR}"
+  cd "${FOSS_BUILD_DIR}"
 
-cmake \
-  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  -DCMAKE_PREFIX_PATH="${DEPS_DIR}" \
-  -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-  -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-  "${FOSS_REVPROXY_SRC_DIR}"
+  cmake \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DCMAKE_PREFIX_PATH="${DEPS_DIR}" \
+    -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
+    -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+    "${FOSS_REVPROXY_SRC_DIR}"
 
-make -j "${JOBS}"
+  make -j "${JOBS}"
 
 ##############################################################################
-# Step 4: Install binaries
+  # Step 4: Install binaries
 ##############################################################################
-echo -e "${COLOR_GREEN}[ INFO ] Installing binaries to ${INSTALL_DIR}${COLOR_OFF}"
-cp -f "${FOSS_BUILD_DIR}/traffic_client" "${INSTALL_DIR}/"
-cp -f "${FOSS_BUILD_DIR}/proxy_server" "${INSTALL_DIR}/"
-cp -f "${FOSS_BUILD_DIR}/content_server" "${INSTALL_DIR}/"
-chmod +x "${INSTALL_DIR}/traffic_client" "${INSTALL_DIR}/proxy_server" "${INSTALL_DIR}/content_server"
+  echo -e "${COLOR_GREEN}[ INFO ] Installing binaries to ${INSTALL_DIR}${COLOR_OFF}"
+  cp -f "${FOSS_BUILD_DIR}/traffic_client" "${INSTALL_DIR}/"
+  cp -f "${FOSS_BUILD_DIR}/proxy_server" "${INSTALL_DIR}/"
+  cp -f "${FOSS_BUILD_DIR}/content_server" "${INSTALL_DIR}/"
+  chmod +x "${INSTALL_DIR}/traffic_client" "${INSTALL_DIR}/proxy_server" "${INSTALL_DIR}/content_server"
+}
+
+##############################################################################
+# Main
+##############################################################################
+echo -e "${COLOR_GREEN}=== CDN Benchmark Install ===${COLOR_OFF}"
+echo -e "${COLOR_GREEN}Install dir:    ${INSTALL_DIR}${COLOR_OFF}"
+
+# Check if already installed
+if [ -x "${INSTALL_DIR}/traffic_client" ] && \
+   [ -x "${INSTALL_DIR}/proxy_server" ] && \
+   [ -x "${INSTALL_DIR}/content_server" ]; then
+  echo -e "${COLOR_GREEN}CDN Benchmark binaries already installed, skipping${COLOR_OFF}"
+  echo -e "${COLOR_GREEN}To force reinstall, run: rm -rf ${INSTALL_DIR}${COLOR_OFF}"
+  exit 0
+fi
+
+if is_meta_internal; then
+  install_internal
+else
+  install_external
+fi
 
 echo -e "${COLOR_GREEN}=== CDN Benchmark Install Complete ===${COLOR_OFF}"
 echo -e "${COLOR_GREEN}Binaries installed:${COLOR_OFF}"