[Box Backup-commit] [boxbackup/boxbackup] 153b87: Backport whitespace and comment fixes from s3_supp...

GitHub noreply at github.com
Fri Nov 10 21:22:21 GMT 2017


  Branch: refs/heads/s3_support
  Home:   https://github.com/boxbackup/boxbackup
  Commit: 153b87b1f41bfc30525f3e6a1936405fc5bdc91b
      https://github.com/boxbackup/boxbackup/commit/153b87b1f41bfc30525f3e6a1936405fc5bdc91b
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M LICENSE.txt
    M contrib/windows/installer/bbackupd.conf.template
    M contrib/windows/installer/tools/InstallService.bat
    M contrib/windows/installer/tools/KillBackupProcess.bat
    M contrib/windows/installer/tools/QueryOutputAll.bat
    M contrib/windows/installer/tools/QueryOutputCurrent.bat
    M contrib/windows/installer/tools/ReloadConfig.bat
    M contrib/windows/installer/tools/RemoveService.bat
    M contrib/windows/installer/tools/RestartService.bat
    M contrib/windows/installer/tools/ShowUsage.bat
    M contrib/windows/installer/tools/StartService.bat
    M contrib/windows/installer/tools/StopService.bat
    M contrib/windows/installer/tools/Sync.bat
    M docs/xsl-generic/highlighting/common.xsl
    M docs/xsl-generic/highlighting/xslthl-config.xml
    M docs/xsl-generic/html/highlight.xsl
    M lib/backupstore/BackupAccountControl.cpp
    M lib/backupstore/BackupFileSystem.cpp
    M lib/backupstore/BackupFileSystem.h
    M lib/backupstore/BackupStoreCheck.cpp
    M lib/backupstore/BackupStoreContext.cpp
    M lib/backupstore/HousekeepStoreAccount.cpp
    M lib/backupstore/StoreTestUtils.cpp
    M lib/backupstore/StoreTestUtils.h
    M lib/bbackupd/BackupClientContext.cpp
    M lib/bbstored/BBStoreDHousekeeping.cpp
    M lib/common/DebugMemLeakFinder.cpp
    M lib/common/Utils.cpp
    M lib/common/Utils.h
    M lib/httpserver/HTTPQueryDecoder.cpp
    M lib/httpserver/S3Client.cpp
    M lib/httpserver/S3Simulator.cpp
    M lib/server/makeprotocol.pl.in
    M runtest.pl.in
    M test/backupstore/testbackupstore.cpp
    M test/backupstorepatch/testbackupstorepatch.cpp

  Log Message:
  -----------
  Backport whitespace and comment fixes from s3_support_merge


  Commit: f24350c9fe1ed45257233819c1069d282548cd1e
      https://github.com/boxbackup/boxbackup/commit/f24350c9fe1ed45257233819c1069d282548cd1e
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M test/httpserver/testhttpserver.cpp

  Log Message:
  -----------
  Test that 100-continue headers are sent and received correctly

This tests that HTTPRequest::SendHeaders includes the "Expect: 100-continue"
header only when expected. A separate test calls HTTPRequest::SendWithStream
which sends these headers, and therefore checks that both sides correctly
handle such exchanges.

(cherry picked from commit 5fad0fd1cb9a1a39756de69ce9348ca692e35bda)


  Commit: 3d5917a7442b14a2bb3d88b502d2d9e8c9757784
      https://github.com/boxbackup/boxbackup/commit/3d5917a7442b14a2bb3d88b502d2d9e8c9757784
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/common/DebugMemLeakFinder.cpp
    M lib/common/MemLeakFinder.h

  Log Message:
  -----------
  Implement placement operator delete

"If the object is being created as part of a new expression, and an exception
is thrown, the object’s memory is deallocated by calling the appropriate
deallocation function. If the object is being created with a placement new
operator, the corresponding placement delete operator is called—that is, the
delete function that takes the same additional parameters as the placement new
operator. If no matching placement delete is found, no deallocation takes
place."

So to avoid memory leaks, we need to implement placement delete operators that
correspond to our placement new, which we use for leak detection (ironically)
in debug builds.

(cherry picked from commit 40cf96207139a31466b98a93298cef4f436eea6b)


  Commit: 33b08e001be075a4e15e6f43f723253087fa4fe2
      https://github.com/boxbackup/boxbackup/commit/33b08e001be075a4e15e6f43f723253087fa4fe2
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/backupstore/BackupCommands.cpp
    M lib/backupstore/StoreTestUtils.cpp
    M lib/httpserver/S3Client.cpp
    M test/backupstore/testbackupstore.cpp

  Log Message:
  -----------
  Fix a long-standing bug in the set_refcount() test helper function

Previously it would truncate the expected refcount list at the first zero entry,
instead of just removing zero entries from the end.

Also move some test code to test_server_commands which should have been there,
since they were causing issues with the check for the refcount database in
test_server_housekeeping. It's hard to disentangle these two changes.

Also disconnect from the HTTP server in S3Client if we receive an exception on
reading, since the connection is no longer known to be in a clean state.

(cherry picked from commit 0ab2508cfd01a32dc39ce689d5b6b7e58a460e38)
(cherry picked from commit b91cdf14c5459f03076ee3668ef4a9c2b78f2227)


  Commit: 6226c014dd2988a6a29cd21f6cc29fa0e7816607
      https://github.com/boxbackup/boxbackup/commit/6226c014dd2988a6a29cd21f6cc29fa0e7816607
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/backupstore/BackupFileSystem.cpp

  Log Message:
  -----------
  Fix rare crash while tearing down S3BackupFileSystem

ReleaseLock() could fail if it can't contact the S3/SimpleDB server, but
destructors aren't allowed to throw exceptions, so catch this case and log
a warning instead (because we failed to release the lock that we were
holding).


  Commit: 4a515b9ce8e616b357dc07bee27aa7b3692c3602
      https://github.com/boxbackup/boxbackup/commit/4a515b9ce8e616b357dc07bee27aa7b3692c3602
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/server/ServerStream.h

  Log Message:
  -----------
  Improve exception handling in single-process servers

Don't allow an uncaught exception to kill the whole server. This makes it
consistent with multi-process servers, where death of a child worker does
not stop the main server process, so it continues to serve requests.

This makes the HTTPServer robust to exceptions (such as the child
disconnecting while the server is streaming a response) on Windows.


  Commit: c492c90062d2e88db1016f13bd912629477a8a46
      https://github.com/boxbackup/boxbackup/commit/c492c90062d2e88db1016f13bd912629477a8a46
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/win32/emu.cpp

  Log Message:
  -----------
  Windows syslog() emulation: improve error messages

If syslog can't log to the Windows event log for some reason, instead of
just printing the log message to the console, include some explanatory
text about what went wrong.


  Commit: 4bb8232ceea9a15d35394d9bb64ee37d9d7ae335
      https://github.com/boxbackup/boxbackup/commit/4bb8232ceea9a15d35394d9bb64ee37d9d7ae335
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M infrastructure/buildenv-testmain-template.cpp

  Log Message:
  -----------
  Completely disable syslog logging in tests


  Commit: 4421c53ab59adb494308f9c9f881a6a57bfd571c
      https://github.com/boxbackup/boxbackup/commit/4421c53ab59adb494308f9c9f881a6a57bfd571c
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/common/Logging.cpp
    M lib/common/Logging.h

  Log Message:
  -----------
  Enable overriding log level by category as well as filename

This extends the -L command-line option to allow overriding by
filename/category=level as well as the existing support for overriding by
filename=level.


  Commit: feddbef8052208508a2e542a1a70c23138f476b8
      https://github.com/boxbackup/boxbackup/commit/feddbef8052208508a2e542a1a70c23138f476b8
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/server/SocketStream.cpp

  Log Message:
  -----------
  SocketStream: use THROW_SOCKET_ERROR for better messages on Windows


  Commit: cc14b3b4b9ec509233000c7d0a995580afd97f15
      https://github.com/boxbackup/boxbackup/commit/cc14b3b4b9ec509233000c7d0a995580afd97f15
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/httpserver/S3Client.h

  Log Message:
  -----------
  Increase timeouts in S3Client to help with debugging


  Commit: ca39b88d4a73b64de68400dfa29270f203fd0f14
      https://github.com/boxbackup/boxbackup/commit/ca39b88d4a73b64de68400dfa29270f203fd0f14
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/httpserver/S3Simulator.cpp

  Log Message:
  -----------
  S3Simulator: add some TRACE logging to help debug 100-continue responses


  Commit: c50aac67ee6ce6af9d63d5b96290585f2c5b7c21
      https://github.com/boxbackup/boxbackup/commit/c50aac67ee6ce6af9d63d5b96290585f2c5b7c21
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/server/ServerStream.h
    M test/backupstore/testbackupstore.cpp

  Log Message:
  -----------
  ServerStream and test/backupstore: improve comments slightly


  Commit: 305138e59a10992382bf1641341614542ae5afba
      https://github.com/boxbackup/boxbackup/commit/305138e59a10992382bf1641341614542ae5afba
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/backupstore/BackupStoreContext.cpp
    M lib/bbstored/BBStoreDHousekeeping.cpp
    M lib/bbstored/BackupStoreDaemon.cpp
    M lib/server/Daemon.cpp
    M lib/server/Daemon.h
    M lib/server/ServerStream.h

  Log Message:
  -----------
  Clear up Daemon command-line arguments -D and -F

By separating their roles (which used to overlap) it's now possible to run a
forking server in the foreground, or a non-forking daemon in the background,
which can be useful for debugging (for example, to more closely simulate how
test daemons work on Windows when running on Unix). -DF is now needed to
have a non-forking server in the foreground.


  Commit: 24bc49f30b9ce54d5024777f9c34d70a476d9663
      https://github.com/boxbackup/boxbackup/commit/24bc49f30b9ce54d5024777f9c34d70a476d9663
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/httpserver/SimpleDBClient.h

  Log Message:
  -----------
  Fix SimpleDB timeouts: should be in milliseconds, not seconds


  Commit: e4f1d5f42ef8ffc46ee5726a536ab1b648518729
      https://github.com/boxbackup/boxbackup/commit/e4f1d5f42ef8ffc46ee5726a536ab1b648518729
  Author: Chris Wilson <chris+github at qwirx.com>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M lib/common/DebugMemLeakFinder.cpp

  Log Message:
  -----------
  Store and log full stack traces for leaked memory allocations

Don't dump stack backtrace when logging memory leaks to a file

Since the backtrace goes to the console instead, it's confusing to have them in
different places.

(cherry picked from commit 6e7df4dfdc06eaff2dd0ef51741df3cf6ba319ea)
(cherry picked from commit 270cd1f16fa8a32b07ae0b9762a417db7b95b82f)
(cherry picked from commit c627e9547fb8a191ea36780b140fd0516a0bffa8)
(cherry picked from commit 336859cb7f499300d4b6e0b6bcd18e275a1f0043)


Compare: https://github.com/boxbackup/boxbackup/compare/e30296a25831...e4f1d5f42ef8


More information about the Boxbackup-commit mailing list