Merge remote-tracking branch 'origin/stable'

debian/control

@@ -8,7 +8,7 @@ Build-Depends: cdbs, debhelper (>= 8),
  python-daemon,
  python-pexpect,
  libncurses5-dev,
- binutils-dev | libiberty-dev,
+ binutils-dev (< 2.23) | libiberty-dev,
  libmysqlclient-dev,
  libpq-dev
 Section: database

extra/rpm.spec.in

@@ -70,7 +70,7 @@ with history support.
 %setup -n @RPM_SOURCE_DIRECTORY_NAME@
 
 %build
-cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT=ON -DENABLE_RPM=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SYSCONF_DIR=/etc -DCMAKE_MAN_DIR=/usr/share/man
+cmake . -DCMAKE_BUILD_TYPE=RelWithDebugInfo -DENABLE_CLIENT=ON -DENABLE_RPM=ON -DENABLE_BACKTRACE=OFF -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SYSCONF_DIR=/etc -DCMAKE_MAN_DIR=/usr/share/man
 
 make %{?_smp_mflags}
 

src/recovery.cc

@@ -1282,7 +1282,8 @@ snapshot_write_row(struct log_io *l, struct fio_batch *batch,
 			 * filesystem cache, otherwise the limit is
 			 * not really enforced.
 			 */
-			fdatasync(fileno(l->f));
+			if (bytes > recovery_state->snap_io_rate_limit)
+				fdatasync(fileno(l->f));
 		}
 		while (bytes >= recovery_state->snap_io_rate_limit) {
 			ev_now_update();