Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

roachprod: Build Charybdefs against thrift 0.13 #53706

Merged
merged 1 commit into from
Sep 1, 2020
Merged

roachprod: Build Charybdefs against thrift 0.13 #53706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pkg/cmd/roachprod/install/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down