release: prepare for 2.2.2 by hagitsegev

Update seastar submodule
* seastar 6f61d74...88cb58c (2): > reactor: disable nowait aio due to a kernel bug > configure.py: Enhance detection for gcc -fvisibility=hidden bug Fixes #3996.
2019-01-12 18:28:25 +02:00 · 2018-12-17 15:57:58 +02:00 · 2018-12-02 13:32:59 +02:00 · 2018-11-21 12:18:25 +02:00 · 2018-10-21 19:04:08 +03:00 · 2018-10-21 18:21:18 +03:00
6 changed files with 15 additions and 15 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 #!/bin/sh

-VERSION=2.2.1
+VERSION=2.2.2

 if test -f version
 then
--- a/database.cc
+++ b/database.cc
@@ -1637,9 +1637,9 @@ future<> distributed_loader::open_sstable(distributed<database>& db, sstables::e
    // to distribute evenly the resource usage among all shards.

    return db.invoke_on(column_family::calculate_shard_from_sstable_generation(comps.generation),
-            [&db, comps = std::move(comps), func = std::move(func), pc] (database& local) {
+            [&db, comps = std::move(comps), func = std::move(func), &pc] (database& local) {

-        return with_semaphore(local.sstable_load_concurrency_sem(), 1, [&db, &local, comps = std::move(comps), func = std::move(func), pc] {
+        return with_semaphore(local.sstable_load_concurrency_sem(), 1, [&db, &local, comps = std::move(comps), func = std::move(func), &pc] {
            auto& cf = local.find_column_family(comps.ks, comps.cf);

            auto f = sstables::sstable::load_shared_components(cf.schema(), cf._config.datadir, comps.generation, comps.version, comps.format, pc);
--- a/dist/debian/build_deb.sh
+++ b/dist/debian/build_deb.sh
@@ -254,19 +254,18 @@ if [ "$TARGET" != "trusty" ]; then
    cp dist/common/systemd/node-exporter.service debian/scylla-server.node-exporter.service
 fi

-sudo cp ./dist/debian/pbuilderrc ~root/.pbuilderrc
 if [ $NO_CLEAN -eq 0 ]; then
    sudo rm -fv /var/cache/pbuilder/scylla-server-$TARGET.tgz
-    sudo -H DIST=$TARGET /usr/sbin/pbuilder clean
-    sudo -H DIST=$TARGET /usr/sbin/pbuilder create --allow-untrusted
+    sudo DIST=$TARGET /usr/sbin/pbuilder clean --configfile ./dist/debian/pbuilderrc
+    sudo DIST=$TARGET /usr/sbin/pbuilder create --configfile ./dist/debian/pbuilderrc --allow-untrusted
 fi
 if [ $JOBS -ne 0 ]; then
    DEB_BUILD_OPTIONS="parallel=$JOBS"
 fi
-sudo -H DIST=$TARGET /usr/sbin/pbuilder update --allow-untrusted
+sudo -H DIST=$TARGET /usr/sbin/pbuilder update --configfile ./dist/debian/pbuilderrc --allow-untrusted
 if [ "$TARGET" = "trusty" ] || [ "$TARGET" = "xenial" ] || [ "$TARGET" = "yakkety" ] || [ "$TARGET" = "zesty" ] || [ "$TARGET" = "artful" ] || [ "$TARGET" = "bionic" ]; then
-    sudo -H DIST=$TARGET /usr/sbin/pbuilder execute --save-after-exec dist/debian/ubuntu_enable_ppa.sh
+    sudo DIST=$TARGET /usr/sbin/pbuilder execute --configfile ./dist/debian/pbuilderrc --save-after-exec dist/debian/ubuntu_enable_ppa.sh
 elif [ "$TARGET" = "jessie" ] || [ "$TARGET" = "stretch" ]; then
-    sudo -H DIST=$TARGET /usr/sbin/pbuilder execute --save-after-exec dist/debian/debian_install_gpgkey.sh
+    sudo DIST=$TARGET /usr/sbin/pbuilder execute --configfile ./dist/debian/pbuilderrc --save-after-exec dist/debian/debian_install_gpgkey.sh
 fi
-sudo -H DIST=$TARGET DEB_BUILD_OPTIONS=$DEB_BUILD_OPTIONS pdebuild --buildresult build/debs
+sudo -H DIST=$TARGET DEB_BUILD_OPTIONS=$DEB_BUILD_OPTIONS pdebuild --configfile ./dist/debian/pbuilderrc --buildresult build/debs
--- a/2
+++ b/2
--- a/tests/network_topology_strategy_test.cc
+++ b/tests/network_topology_strategy_test.cc
@@ -53,7 +53,7 @@ void print_natural_endpoints(double point, const std::vector<inet_address> v) {
    nlogger.debug("{}", strm.str());
 }

-#ifndef SEASTAR_DEBUG
+#ifndef DEBUG
 static void verify_sorted(const dht::token_range_vector& trv) {
    auto not_strictly_before = [] (const dht::token_range a, const dht::token_range b) {
        return !b.start()
@@ -67,7 +67,7 @@ static void verify_sorted(const dht::token_range_vector& trv) {

 static void check_ranges_are_sorted(abstract_replication_strategy* ars, gms::inet_address ep) {
    // Too slow in debug mode
-#ifndef SEASTAR_DEBUG
+#ifndef DEBUG
    verify_sorted(ars->get_ranges(ep));
    verify_sorted(ars->get_primary_ranges(ep));
 #endif
--- a/utils/phased_barrier.hh
+++ b/utils/phased_barrier.hh
@@ -68,10 +68,11 @@ public:

    // Starts a new phase and waits for all operations started in any of the earlier phases.
    // It is fine to start multiple awaits in parallel.
+    // Strong exception guarantees.
    future<> advance_and_await() {
+        auto new_gate = make_lw_shared<gate>();
        ++_phase;
-        auto old_gate = std::move(_gate);
-        _gate = make_lw_shared<gate>();
+        auto old_gate = std::exchange(_gate, std::move(new_gate));
        return old_gate->close().then([old_gate, op = start()] {});
    }
Author	SHA1	Message	Date
Jenkins	d27eb734a7	release: prepare for 2.2.2 by hagitsegev	2019-01-12 18:28:25 +02:00
Avi Kivity	e6aeb490b5	Update seastar submodule * seastar 6f61d74...88cb58c (2): > reactor: disable nowait aio due to a kernel bug > configure.py: Enhance detection for gcc -fvisibility=hidden bug Fixes #3996.	2018-12-17 15:57:58 +02:00
Vladimir Krivopalov	2e3b09b593	database: Capture io_priority_class by reference to avoid dangling ref. The original reference points to a thread-local storage object that guaranteed to outlive the continuation, but copying it make the subsequent calls point to a local object and introduces a use-after-free bug. Fixes #3948 Signed-off-by: Vladimir Krivopalov <vladimir@scylladb.com> (cherry picked from commit `68458148e7`)	2018-12-02 13:32:59 +02:00
Tomasz Grabiec	92c74f4e0b	utils: phased_barrier: Make advance_and_await() have strong exception guarantees Currently, when advance_and_await() fails to allocate the new gate object, it will throw bad_alloc and leave the phased_barrier object in an invalid state. Calling advance_and_await() again on it will result in undefined behavior (typically SIGSEGV) beacuse _gate will be disengaged. One place affected by this is table::seal_active_memtable(), which calls _flush_barrier.advance_and_await(). If this throws, subsequent flush attempts will SIGSEGV. This patch rearranges the code so that advance_and_await() has strong exception guarantees. Message-Id: <1542645562-20932-1-git-send-email-tgrabiec@scylladb.com> Fixes #3931. (cherry picked from commit `57e25fa0f8`)	2018-11-21 12:18:25 +02:00
Avi Kivity	89d835e9e3	tests: fix network_topology_test timing out in debug mode In 2.2, SEASTAR_DEBUG is just DEBUG.	2018-10-21 19:04:08 +03:00
Takuya ASADA	263a740084	dist/debian: use --configfile to specify pbuilderrc Use --configfile to specify pbuilderrc, instead of copying it to home directory. Signed-off-by: Takuya ASADA <syuu@scylladb.com> Message-Id: <20180420024624.9661-1-syuu@scylladb.com> (cherry picked from commit `01c36556bf`)	2018-10-21 18:21:18 +03:00