From a8bd0df2b3a23a30a6e6124dc95c85a562842a91 Mon Sep 17 00:00:00 2001 From: Bilal Akhtar Date: Mon, 31 Aug 2020 16:20:16 -0400 Subject: [PATCH] roachprod: Build Charybdefs against thrift 0.13 As we use Ubuntu 18.04 on Roachprod clusters, which has a newer version of bundler and ruby, we have to use a newer version of Thrift. Using newer Thrift also necessitates some changes in Charybdefs' build files, so I've forked it, used the fork here, and submitted the changes upstream: https://github.com/scylladb/charybdefs/pull/21 Fixes #52533. Release justification: Roachtest/roachprod only fix. Release note: None. --- pkg/cmd/roachprod/install/install.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/roachprod/install/install.go b/pkg/cmd/roachprod/install/install.go index afa8964ba293..6699189511bf 100644 --- a/pkg/cmd/roachprod/install/install.go +++ b/pkg/cmd/roachprod/install/install.go @@ -39,7 +39,7 @@ sudo service cassandra stop; sudo mkdir -p "${thrift_dir}" sudo chmod 777 "${thrift_dir}" cd "${thrift_dir}" - curl "https://downloads.apache.org/thrift/0.10.0/thrift-0.10.0.tar.gz" | sudo tar xvz --strip-components 1 + curl "https://downloads.apache.org/thrift/0.13.0/thrift-0.13.0.tar.gz" | sudo tar xvz --strip-components 1 sudo ./configure --prefix=/usr sudo make -j$(nproc) sudo make install @@ -54,7 +54,8 @@ sudo service cassandra stop; sudo rm -rf "${charybde_dir}" "${nemesis_path}" /usr/local/bin/charybdefs{,-nemesis} sudo mkdir -p "${charybde_dir}" sudo chmod 777 "${charybde_dir}" - git clone --depth 1 "https://github.com/scylladb/charybdefs.git" "${charybde_dir}" + # TODO(bilal): Change URL back to scylladb/charybdefs once https://github.com/scylladb/charybdefs/pull/21 is merged. + git clone --depth 1 "https://github.com/itsbilal/charybdefs.git" "${charybde_dir}" cd "${charybde_dir}" thrift -r --gen cpp server.thrift