dist: prevent error building ubuntu package on EC2

fixes #491

Signed-off-by: Takuya ASADA <syuu@scylladb.com>

SCYLLA-VERSION-GEN

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-VERSION=development
+VERSION=0.11.1
 
 if test -f version
 then

cql3/query_processor.cc

@@ -61,11 +61,10 @@ distributed<query_processor> _the_query_processor;
 const sstring query_processor::CQL_VERSION = "3.2.0";
 
 class query_processor::internal_state {
-    service::client_state _cs;
     service::query_state _qs;
 public:
     internal_state()
-            : _cs(service::client_state::internal_tag()), _qs(_cs) {
+            : _qs(service::client_state{service::client_state::internal_tag()}) {
     }
     operator service::query_state&() {
         return _qs;
@@ -74,14 +73,13 @@ public:
         return _qs;
     }
     operator service::client_state&() {
-        return _cs;
+        return _qs.get_client_state();
     }
     operator const service::client_state&() const {
-        return _cs;
+        return _qs.get_client_state();
     }
-
     api::timestamp_type next_timestamp() {
-        return _cs.get_timestamp();
+        return _qs.get_client_state().get_timestamp();
     }
 };
 

debian/control

@@ -11,3 +11,10 @@ Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, hugepages
 Description: Scylla database server binaries 
  Scylla is a highly scalable, eventually consistent, distributed, partitioned row DB.
+
+Package: scylla-server-dbg
+Architecture: amd64
+Depends: scylla-server (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: debugging symbols for scylla-server
+ Scylla is a highly scalable, eventually consistent, distributed, partitioned row DB.
+ This package contains the debugging symbols for scylla-server.

debian/rules

@@ -41,6 +41,10 @@ override_dh_auto_install:
 	mkdir -p $(CURDIR)/debian/scylla-server/var/lib/scylla/conf
 	cp $(CURDIR)/conf/scylla.yaml \
 		$(CURDIR)/debian/scylla-server/var/lib/scylla/conf
+	cp $(CURDIR)/conf/cassandra-rackdc.properties \
+		$(CURDIR)/debian/scylla-server/var/lib/scylla/conf
 
+override_dh_strip:
+	dh_strip --dbg-package=scylla-server-dbg
 %:
 	dh $@

debian/scylla-server.upstart

@@ -7,12 +7,8 @@ description	"ScyllaDB server"
 start on runlevel [2345]
 stop on runlevel [!2345]
 
-respawn
-respawn limit 10 5
 umask 022
 
-expect fork
-
 console log
 
 pre-start script
@@ -26,7 +22,7 @@ script
     cd /var/lib/scylla
     . /etc/default/scylla-server
     export OPTS_FILE NETWORK_MODE TAP BRIDGE ETHDRV ETHPCIID NR_HUGEPAGES USER GROUP SCYLLA_ARGS
-    /usr/lib/scylla/scylla_run
+    exec /usr/lib/scylla/scylla_run
 end script
 
 post-stop script

dist/ami/build_ami.sh

@@ -1,9 +1,7 @@
 #!/bin/sh -e
 
-if [ ! -e dist/ami/build_ami.sh ] || [ ! -e ../scylla-jmx/dist/redhat/build_rpm.sh ] || [ ! -e ../cassandra/dist/redhat/build_rpm.sh ]; then
+if [ ! -e dist/ami/build_ami.sh ]; then
     echo "run build_ami.sh in top of scylla dir"
-    echo "please make sure scylla-jmx is checked out under the same directory as scylla"
-    echo "please make sure cassandra with scylla tools branch checked out under the same directory as scylla"
     exit 1
 fi
 
@@ -14,39 +12,6 @@ if [ ! -f variables.json ]; then
     exit 1
 fi
 
-if [ ! -f files/scylla-server.rpm ] || [ ! -f files/scylla-server-debuginfo.rpm ]; then
-    cd ../../
-    dist/redhat/build_rpm.sh
-    SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE)
-    SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE)
-    RPM=`ls build/rpms/scylla-server-$SCYLLA_VERSION-$SCYLLA_RELEASE*.x86_64.rpm|grep -v debuginfo`
-    cp $RPM dist/ami/files/scylla-server.rpm
-    cp build/rpms/scylla-server-debuginfo-$SCYLLA_VERSION-$SCYLLA_RELEASE*.x86_64.rpm dist/ami/files/scylla-server-debuginfo.rpm
-    cd -
-fi
-
-if [ ! -f files/scylla-jmx.rpm ]; then
-    CWD=`pwd`
-    cd ../../../scylla-jmx
-    dist/redhat/build_rpm.sh
-    SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE)
-    SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE)
-    RPM=`ls build/rpms/scylla-jmx-$SCYLLA_VERSION-$SCYLLA_RELEASE*.noarch.rpm`
-    cp $RPM $CWD/files/scylla-jmx.rpm
-    cd -
-fi
-
-if [ ! -f files/scylla-tools.rpm ]; then
-    CWD=`pwd`
-    cd ../../../cassandra
-    dist/redhat/build_rpm.sh
-    SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE)
-    SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE)
-    RPM=`ls build/rpms/scylla-tools-$SCYLLA_VERSION-$SCYLLA_RELEASE*.noarch.rpm`
-    cp $RPM $CWD/files/scylla-tools.rpm
-    cd -
-fi
-
 if [ ! -d packer ]; then
     wget https://dl.bintray.com/mitchellh/packer/packer_0.8.6_linux_amd64.zip
     mkdir packer

dist/ami/files/scylla-setup.sh

@@ -1,27 +1,49 @@
 #!/bin/sh -e
 
-if [ -f /dev/md0 ]; then
+if [ -b /dev/md0 ]; then
     echo "RAID already constructed."
     exit 1
 fi
-mdadm --create --verbose --force --run /dev/md0 --level=0 -c256 --raid-devices=2 /dev/xvdb /dev/xvdc
-blockdev --setra 65536 /dev/md0
-mkfs.xfs /dev/md0 -f
-echo "DEVICE /dev/xvdb /dev/xvdc" > /etc/mdadm.conf
-mdadm --detail --scan >> /etc/mdadm.conf 
-UUID=`blkid /dev/md0 | awk '{print $2}'`
-mkdir /data
-echo "$UUID /data xfs noatime 0 0" >> /etc/fstab
-mount /data
+
+dnf update -y
+
+DISKS=""
+NR=0
+for i in xvd{b..z}; do
+    if [ -b /dev/$i ];then
+        echo Found disk /dev/$i
+        DISKS="$DISKS /dev/$i"
+        NR=$((NR+1))
+    fi
+done
+
+echo Creating RAID0 for scylla using $NR disk\(s\): $DISKS
+
+if [ $NR -ge 1 ]; then
+    mdadm --create --verbose --force --run /dev/md0 --level=0 -c256 --raid-devices=$NR $DISKS
+    blockdev --setra 65536 /dev/md0
+    mkfs.xfs /dev/md0 -f
+    echo "DEVICE $DISKS" > /etc/mdadm.conf
+    mdadm --detail --scan >> /etc/mdadm.conf
+    UUID=`blkid /dev/md0 | awk '{print $2}'`
+    mkdir /data
+    echo "$UUID /data xfs noatime 0 0" >> /etc/fstab
+    mount /data
+else
+   echo "WARN: Scylla is not using XFS to store data. Perforamnce will suffer." > /home/fedora/WARN_PLEASE_READ.TXT
+fi
+
 mkdir -p /data/data
 mkdir -p /data/commitlog
 chown scylla:scylla /data/*
+
 CPU_NR=`cat /proc/cpuinfo |grep processor|wc -l`
 if [ $CPU_NR -ge 8 ]; then
     NR=$((CPU_NR - 1))
     echo SCYLLA_ARGS=\"--cpuset 1-$NR  --smp $NR\" >> /etc/sysconfig/scylla-server
     echo SET_NIC=\"yes\" >> /etc/sysconfig/scylla-server
 fi
+
 /usr/lib/scylla/scylla-ami/ds2_configure.py
 systemctl disable scylla-setup.service
 systemctl enable scylla-server.service

dist/ami/files/scylla.repo

@@ -0,0 +1,11 @@
+[scylla]
+name=Scylla for Fedora $releasever - $basearch
+baseurl=https://s3.amazonaws.com/downloads.scylladb.com/rpm/fedora/$releasever/$basearch/
+enabled=1
+gpgcheck=0
+
+[scylla-generic]
+name=Scylla for Fedora $releasever 
+baseurl=https://s3.amazonaws.com/downloads.scylladb.com/rpm/fedora/$releasever/noarch/
+enabled=1
+gpgcheck=0

dist/ami/files/setup-ami.sh

@@ -0,0 +1,20 @@
+#!/bin/sh -e
+
+setenforce 0
+sed -e "s/enforcing/disabled/" /etc/sysconfig/selinux > /tmp/selinux
+mv /tmp/selinux /etc/sysconfig/
+dnf update -y
+mv /home/fedora/scylla.repo /etc/yum.repos.d/
+dnf install -y scylla-server scylla-server-debuginfo scylla-jmx scylla-tools
+dnf install -y mdadm xfsprogs
+cp /home/fedora/coredump.conf /etc/systemd/coredump.conf
+mv /home/fedora/scylla-setup.service /usr/lib/systemd/system
+mv /home/fedora/scylla-setup.sh /usr/lib/scylla
+chmod a+rx /usr/lib/scylla/scylla-setup.sh
+mv /home/fedora/scylla-ami /usr/lib/scylla/scylla-ami
+chmod a+rx /usr/lib/scylla/scylla-ami/ds2_configure.py
+systemctl enable scylla-setup.service
+sed -e 's!/var/lib/scylla/data!/data/data!' -e 's!commitlog_directory: /var/lib/scylla/commitlog!commitlog_directory: /data/commitlog!' /var/lib/scylla/conf/scylla.yaml > /tmp/scylla.yaml
+mv /tmp/scylla.yaml /var/lib/scylla/conf
+grep -v ' - mounts' /etc/cloud/cloud.cfg > /tmp/cloud.cfg
+mv /tmp/cloud.cfg /etc/cloud/cloud.cfg

dist/ami/scylla.json

@@ -24,20 +24,7 @@
     {
       "type": "shell",
       "inline": [
-        "sudo dnf update -y",
-        "sudo dnf install -y /home/fedora/*.rpm",
-        "sudo dnf install -y mdadm xfsprogs",
-        "sudo cp /home/fedora/coredump.conf /etc/systemd/coredump.conf",
-        "sudo mv /home/fedora/scylla-setup.service /usr/lib/systemd/system",
-        "sudo mv /home/fedora/scylla-setup.sh /usr/lib/scylla",
-        "sudo chmod a+rx /usr/lib/scylla/scylla-setup.sh",
-	"sudo mv /home/fedora/scylla-ami /usr/lib/scylla/scylla-ami",
-	"sudo chmod a+rx /usr/lib/scylla/scylla-ami/ds2_configure.py",
-        "sudo systemctl enable scylla-setup.service",
-	"sudo sed -e 's!/var/lib/scylla/data!/data/data!' -e 's!commitlog_directory: /var/lib/scylla/commitlog!commitlog_directory: /data/commitlog!' /var/lib/scylla/conf/scylla.yaml > /tmp/scylla.yaml",
-        "sudo mv /tmp/scylla.yaml /var/lib/scylla/conf",
-	"grep -v ' - mounts' /etc/cloud/cloud.cfg > /tmp/cloud.cfg",
-	"sudo mv /tmp/cloud.cfg /etc/cloud/cloud.cfg"
+	"sudo sh -x -e /home/fedora/setup-ami.sh"
       ]
     }
   ],

dist/common/scripts/scylla_run

@@ -14,4 +14,4 @@ if [ "$SET_NIC" == "yes" ]; then
     sudo sh /usr/lib/scylla/posix_net_conf.sh >/dev/null 2>&1 || true
 fi
 
-exec sudo -u $USER env HOME=/var/lib/scylla /usr/bin/scylla $args
+exec sudo -u $USER env HOME=/var/lib/scylla SCYLLA_HOME=/var/lib/scylla /usr/bin/scylla $args

dist/redhat/scylla-server.spec.in

@@ -55,6 +55,7 @@ install -d -m755 $RPM_BUILD_ROOT%{_sharedstatedir}/scylla/data
 install -d -m755 $RPM_BUILD_ROOT%{_sharedstatedir}/scylla/commitlog
 install -d -m755 $RPM_BUILD_ROOT%{_sharedstatedir}/scylla/conf
 install -m644 conf/scylla.yaml $RPM_BUILD_ROOT%{_sharedstatedir}/scylla/conf/
+install -m644 conf/cassandra-rackdc.properties $RPM_BUILD_ROOT%{_sharedstatedir}/scylla/conf/
 
 %pre
 /usr/sbin/groupadd scylla 2> /dev/null || :
@@ -101,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,scylla,scylla) %dir %{_sharedstatedir}/scylla/commitlog
 %attr(0755,root,root) %dir %{_sharedstatedir}/scylla/conf/
 %{_sharedstatedir}/scylla/conf/scylla.yaml
+%{_sharedstatedir}/scylla/conf/cassandra-rackdc.properties
 
 %changelog
 * Tue Jul 21 2015 Takuya ASADA <syuu@cloudius-systems.com>

dist/ubuntu/build_deb.sh

@@ -5,6 +5,8 @@ if [ ! -e dist/ubuntu/build_deb.sh ]; then
     exit 1
 fi
 
+sudo apt-get -y update
+
 ./dist/ubuntu/dep/build_dependency.sh
 
 sudo apt-get -y install libyaml-cpp-dev liblz4-dev libsnappy-dev libcrypto++-dev libboost1.55-dev libjsoncpp-dev libaio-dev ragel ninja-build git libyaml-cpp0.5 liblz4-1 libsnappy1 libcrypto++9 libboost-program-options1.55.0 libboost-program-options1.55-dev libboost-system1.55.0 libboost-system1.55-dev libboost-thread1.55.0 libboost-thread1.55-dev libboost-test1.55.0 libboost-test1.55-dev libjsoncpp0 libaio1 hugepages software-properties-common libboost-filesystem1.55-dev libboost-filesystem1.55.0
@@ -12,4 +14,14 @@ sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 sudo apt-get -y update
 sudo apt-get -y install g++-4.9
 
+VERSION=$(./SCYLLA-VERSION-GEN)
+SCYLLA_VERSION=$(cat build/SCYLLA-VERSION-FILE)
+SCYLLA_RELEASE=$(cat build/SCYLLA-RELEASE-FILE)
+if [ "$SCYLLA_VERSION" = "development" ]; then
+	SCYLLA_VERSION=0development
+fi
+cp dist/ubuntu/changelog.in debian/changelog
+sed -i -e "s/@@VERSION@@/$SCYLLA_VERSION/g" debian/changelog
+sed -i -e "s/@@RELEASE@@/$SCYLLA_RELEASE/g" debian/changelog
+
 debuild -r fakeroot --no-tgz-check -us -uc

dist/ubuntu/changelog.in

@@ -1,4 +1,4 @@
-scylla-server (0.10-1) unstable; urgency=medium
+scylla-server (@@VERSION@@-@@RELEASE@@-ubuntu1) trusty; urgency=medium
 
   * Initial release.
 

dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/changelog

@@ -1,4 +1,4 @@
-antlr3-c++-dev (3.5.2-1) unstable; urgency=medium
+antlr3-c++-dev (3.5.2-ubuntu1) trusty; urgency=medium
 
   * Initial release.
 

dist/ubuntu/dep/antlr3-c++-dev-3.5.2/debian/control

@@ -8,5 +8,5 @@ Build-Depends: debhelper (>= 9)
 Package: antlr3-c++-dev
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: antlr3-c++-dev
- antlr3-c++-dev
+Description: language tool for constructing recognizers, compilers etc
+ A language tool that provides a framework for constructing recognizers, interpreters, compilers, and translators from grammatical descriptions containing actions in a variety of target languages.

dist/ubuntu/dep/antlr3-tool-3.5.2/debian/changelog

@@ -1,4 +1,4 @@
-antlr3-tool (3.5.2-1) unstable; urgency=medium
+antlr3-tool (3.5.2-ubuntu1) trusty; urgency=medium
 
   * Initial release.
 

dist/ubuntu/dep/antlr3-tool-3.5.2/debian/control

@@ -8,5 +8,5 @@ Build-Depends: debhelper (>= 9)
 Package: antlr3-tool
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-7-jre-headless
-Description: antlr3-tool
- antlr3-tool
+Description: language tool for constructing recognizers, compilers etc
+ A language tool that provides a framework for constructing recognizers, interpreters, compilers, and translators from grammatical descriptions containing actions in a variety of target languages.

dist/ubuntu/dep/thrift.diff

@@ -1,6 +1,78 @@
-diff -Nur debian/control /root/thrift-0.9.1/debian/control
---- debian/control	2013-08-18 14:58:22.000000000 +0000
-+++ /root/thrift-0.9.1/debian/control	2015-09-29 12:17:18.000000000 +0000
+diff -Nur ./debian/changelog ../thrift-0.9.1/debian/changelog
+--- ./debian/changelog	2013-08-15 23:04:29.000000000 +0900
++++ ../thrift-0.9.1/debian/changelog	2015-10-29 23:03:25.797937232 +0900
+@@ -1,65 +1,4 @@
+-thrift (1.0.0-dev) stable; urgency=low
+-  * update version
+-  * fix libthrift0.install
++thrift (0.9.1-ubuntu1) trusty; urgency=medium
++  * Make it able to build on Ubuntu 14.04LTS
+ 
+- -- Roger Meier <roger@apache.org>  Tue, 08 Jan 2013 22:40:12 +0100
+-
+-thrift (0.9.0) stable; urgency=low
+-
+-  * update to 0.9.0
+-
+- -- Jake Farrell <jfarrell@apache.org>  Wed, 10 Oct 2012 12:00:00 -0500
+-
+-thrift (0.7.0) stable; urgency=low
+-
+-  * update to 0.7.0
+-
+- -- Jake Farrell <jfarrell@apache.org>  Tue, 10 Aug 2011 17:01:53 -0500
+-
+-thrift (0.7.0-dev1) stable; urgency=low
+-  * added glib
+-  * fix location of libthrift.jar
+-
+- -- Roger Meier <roger@apache.org>  Tue, 12 Apr 2011 21:41:18 +0200
+-
+-thrift (0.6.0-dev1) stable; urgency=low
+-
+-  * update version field
+-  * added debian folder to thrift/contrib
+-  * changed a few details in control file
+-  * update copyright file
+-
+- -- Roger Meier <roger@apache.org>  Tue, 14 Dec 2010 12:12:33 -0800
+-
+-thrift (0.5.0+nmu2) stable; urgency=low
+-
+-  * Non-maintainer upload.
+-  * Merged THRIFT-71_v9.patch to skip ./bootstrap.sh if not exists.
+-    https://issues.apache.org/jira/secure/attachment/12465360/THRIFT-71_v9.patch
+-
+- -- Yamashita Yuu <yamashita@geishatokyo.com>  Tue, 07 Dec 2010 15:00:55 +0900
+-
+-thrift (0.5.0+nmu1) stable; urgency=low
+-
+-  * Non-maintainer upload.
+-  * Imported package information for php5-thrift from https://github.com/simplegeo/thrift.
+-
+- -- Yamashita Yuu <yamashita@geishatokyo.com>  Tue, 07 Dec 2010 01:00:17 +0900
+-
+-thrift (0.5.0) stable; urgency=low
+-
+-  * update to 0.5.0
+-
+- -- Roger Meier <roger@apache.org>  Fri, 08 Oct 2010 11:23:53 +0200
+-
+-thrift (0.4.0) stable; urgency=low
+-
+-  * update to 0.4.0
+-
+- -- Roger Meier <roger@bufferoverflow.ch>  Sun, 22 Aug 2010 21:26:00 +0100
+-
+-thrift (0.2008.12.30~8.04) hardy; urgency=low
+-
+-  * Initial release.
+-
+- -- Esteve Fernandez <esteve@fluidinfo.com>  Thu, 15 Jan 2009 11:34:24 +0100
++ -- Takuya ASADA <syuu@scylladb.com>  Wed, 28 Oct 2015 05:11:38 +0900
+diff -Nur ./debian/control ../thrift-0.9.1/debian/control
+--- ./debian/control	2013-08-18 23:58:22.000000000 +0900
++++ ../thrift-0.9.1/debian/control	2015-10-28 00:54:05.950464999 +0900
 @@ -1,12 +1,10 @@
  Source: thrift
  Section: devel
@@ -133,9 +205,9 @@ diff -Nur debian/control /root/thrift-0.9.1/debian/control
 - build services that work efficiently and seamlessly.
 - .
 - This package contains the PHP bindings for Thrift.
-diff -Nur debian/rules /root/thrift-0.9.1/debian/rules
---- debian/rules	2013-08-15 14:04:29.000000000 +0000
-+++ /root/thrift-0.9.1/debian/rules	2015-09-29 12:32:28.000000000 +0000
+diff -Nur ./debian/rules ../thrift-0.9.1/debian/rules
+--- ./debian/rules	2013-08-15 23:04:29.000000000 +0900
++++ ../thrift-0.9.1/debian/rules	2015-10-28 00:54:05.950464999 +0900
 @@ -45,18 +45,6 @@
  	# Compile C (glib) library
  	$(MAKE) -C $(CURDIR)/lib/c_glib

locator/ec2_multi_region_snitch.cc

@@ -52,7 +52,7 @@ future<> ec2_multi_region_snitch::start() {
         if (engine().cpu_id() == io_cpu_id()) {
             return aws_api_call(AWS_QUERY_SERVER_ADDR, PUBLIC_IP_QUERY_REQ).then([this](sstring pub_addr){
                 inet_address local_public_address = inet_address(pub_addr);
-                logger().info("EC2MultiRegionSnitch using publicIP as identifier: {}", local_public_address);
+                logger().info("Ec2MultiRegionSnitch using publicIP as identifier: {}", local_public_address);
 
                 //
                 // Use the Public IP to broadcast Address to other nodes.
@@ -117,16 +117,16 @@ void ec2_multi_region_snitch::gossiper_starting() {
 }
 
 using registry_2_params = class_registrator<i_endpoint_snitch, ec2_multi_region_snitch, const sstring&, unsigned>;
-static registry_2_params registrator2("org.apache.cassandra.locator.EC2MultiRegionSnitch");
-static registry_2_params registrator2_short_name("EC2MultiRegionSnitch");
+static registry_2_params registrator2("org.apache.cassandra.locator.Ec2MultiRegionSnitch");
+static registry_2_params registrator2_short_name("Ec2MultiRegionSnitch");
 
 
 using registry_1_param = class_registrator<i_endpoint_snitch, ec2_multi_region_snitch, const sstring&>;
-static registry_1_param registrator1("org.apache.cassandra.locator.EC2MultiRegionSnitch");
-static registry_1_param registrator1_short_name("EC2MultiRegionSnitch");
+static registry_1_param registrator1("org.apache.cassandra.locator.Ec2MultiRegionSnitch");
+static registry_1_param registrator1_short_name("Ec2MultiRegionSnitch");
 
 using registry_default = class_registrator<i_endpoint_snitch, ec2_multi_region_snitch>;
-static registry_default registrator_default("org.apache.cassandra.locator.EC2MultiRegionSnitch");
-static registry_default registrator_default_short_name("EC2MultiRegionSnitch");
+static registry_default registrator_default("org.apache.cassandra.locator.Ec2MultiRegionSnitch");
+static registry_default registrator_default_short_name("Ec2MultiRegionSnitch");
 
 } // namespace locator

locator/ec2_snitch.cc

@@ -36,7 +36,7 @@ future<> ec2_snitch::load_config() {
 
             return read_property_file().then([this] (sstring datacenter_suffix) {
                 _my_dc += datacenter_suffix;
-                logger().info("EC2Snitch using region: {}, zone: {}.", _my_dc, _my_rack);
+                logger().info("Ec2Snitch using region: {}, zone: {}.", _my_dc, _my_rack);
 
                 return _my_distributed->invoke_on_all(
                     [this] (snitch_ptr& local_s) {
@@ -114,15 +114,15 @@ future<sstring> ec2_snitch::read_property_file() {
 }
 
 using registry_2_params = class_registrator<i_endpoint_snitch, ec2_snitch, const sstring&, unsigned>;
-static registry_2_params registrator2("org.apache.cassandra.locator.EC2Snitch");
-static registry_2_params registrator2_short_name("EC2Snitch");
+static registry_2_params registrator2("org.apache.cassandra.locator.Ec2Snitch");
+static registry_2_params registrator2_short_name("Ec2Snitch");
 
 
 using registry_1_param = class_registrator<i_endpoint_snitch, ec2_snitch, const sstring&>;
-static registry_1_param registrator1("org.apache.cassandra.locator.EC2Snitch");
-static registry_1_param registrator1_short_name("EC2Snitch");
+static registry_1_param registrator1("org.apache.cassandra.locator.Ec2Snitch");
+static registry_1_param registrator1_short_name("Ec2Snitch");
 
 using registry_default = class_registrator<i_endpoint_snitch, ec2_snitch>;
-static registry_default registrator_default("org.apache.cassandra.locator.EC2Snitch");
-static registry_default registrator_default_short_name("EC2Snitch");
+static registry_default registrator_default("org.apache.cassandra.locator.Ec2Snitch");
+static registry_default registrator_default_short_name("Ec2Snitch");
 } // namespace locator

service/query_state.hh

@@ -37,6 +37,9 @@ public:
     client_state& get_client_state() {
         return _client_state;
     }
+    const client_state& get_client_state() const {
+        return _client_state;
+    }
     api::timestamp_type get_timestamp() {
         return _client_state.get_timestamp();
     }