neo4j/neo4j — pull request #2239 by chrisvest (2014-04-07 12:29:58+00:00)
Title: Squashed commit of the following:

commit 8678de11566c6813726f56311e9140148f6498f0
Merge: f2b5434 f4bb164
Author: Chris Vest
Date: Mon Apr 7 11:55:40 2014 +0200

Merge commit 'f4bb164' into 2.0-merge-1.9

commit f2b5434cc13a0e089524638de542bc4c5b7019a6
Merge: 5db38f5 4765d9a
Author: Chris Vest
Date: Mon Apr 7 11:55:18 2014 +0200

Merge commit '4765d9a' into 2.0-merge-1.9

commit 5db38f5a602c2695575dde7209bc4b950cd3a948
Merge: 8177006 e49804e
Author: Chris Vest
Date: Mon Apr 7 11:55:03 2014 +0200

Merge commit 'e49804e' into 2.0-merge-1.9

commit 81770066d3a0b5794a057e57f59d925be7385763
Merge: cd1921c 5deecc7
Author: Chris Vest
Date: Mon Apr 7 11:54:48 2014 +0200

Merge commit '5deecc7' into 2.0-merge-1.9

Conflicts:
community/server/src/main/java/org/neo4j/server/rest/web/CollectUserAgentFilter.java

commit cd1921c3522c1cf9faef5e6fe2a8fdbadb2f9ec8
Merge: b218cec a8d6968
Author: Chris Vest
Date: Mon Apr 7 11:51:22 2014 +0200

Merge commit 'a8d6968' into 2.0-merge-1.9

commit b218cece74a8ae9ace1e588aaeeaeab5ac1359df
Merge: 3b819f4 ca1dd77
Author: Chris Vest
Date: Mon Apr 7 11:51:13 2014 +0200

Merge commit 'ca1dd77' into 2.0-merge-1.9

Conflicts:
community/kernel/CHANGES.txt

commit 3b819f4585ad6fe1d4d97e66a8aa99fc52b4b5c4
Merge: f531502 0920288
Author: Chris Vest
Date: Mon Apr 7 11:50:04 2014 +0200

Merge commit '0920288' into 2.0-merge-1.9

commit f531502a10e8e171fbdbbe24d2bf479148c94e21
Merge: 934d228 2cb8a29
Author: Chris Vest
Date: Mon Apr 7 11:49:52 2014 +0200

Merge commit '2cb8a29' into 2.0-merge-1.9

commit 934d228d3ce0698621bfa831d6c8a8db6da4aace
Merge: e6fef1c eb1849d
Author: Chris Vest
Date: Mon Apr 7 11:49:33 2014 +0200

Merge commit 'eb1849d' into 2.0-merge-1.9

commit e6fef1c6ac1f70b7ed32649db534910c4a71f544
Merge: 00de907 e4879ee
Author: Chris Vest
Date: Mon Apr 7 11:49:15 2014 +0200

Merge commit 'e4879ee' into 2.0-merge-1.9

Conflicts:
advanced/server-advanced/src/test/java/org/neo4j/server/advanced/BootstrapperTest.java
community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TxManagerTest.java
community/server/src/test/java/org/neo4j/server/web/logging/HTTPLoggingDocIT.java

commit 00de907ca0713030438e3423d7ddac1d87bbca68
Merge: 2774372 3c6e81d
Author: Chris Vest
Date: Mon Apr 7 11:35:37 2014 +0200

Merge commit '3c6e81d' into 2.0-merge-1.9

commit 277437240211905a71f9380efa6dc31a90960a1b
Merge: ce96c58 b887012
Author: Chris Vest
Date: Mon Apr 7 11:35:26 2014 +0200

Merge commit 'b887012' into 2.0-merge-1.9

Conflicts:
community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestApplyTransactions.java

commit ce96c5871fbd2bc89a50f2b6924b0dbbc1826d21
Merge: 62ba2af 9621470
Author: Chris Vest
Date: Mon Apr 7 11:34:15 2014 +0200

Merge commit '9621470' into 2.0-merge-1.9

commit 62ba2af79e43f8161f05161ea43e1a28669345e2
Merge: 531a00f 7f0838f
Author: Chris Vest
Date: Mon Apr 7 11:34:08 2014 +0200

Merge commit '7f0838f' into 2.0-merge-1.9

Conflicts:
community/server/src/main/java/org/neo4j/server/web/Jetty9WebServer.java

commit 531a00fe97fd0578fe0a6153d8b0885372b67a2a
Merge: 422af74 f26fcad
Author: Chris Vest
Date: Mon Apr 7 11:29:44 2014 +0200

Merge commit 'f26fcad' into 2.0-merge-1.9

commit 422af7416cdc2013087d7f238f0ef33d9b9c322f
Merge: ac0b5f2 38eb5c2
Author: Chris Vest
Date: Mon Apr 7 11:29:28 2014 +0200

Merge commit '38eb5c2' into 2.0-merge-1.9

Conflicts:
community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactory.java
community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TxManager.java
community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/InterceptingXaLogicalLog.java
community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaFactory.java
community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLog.java
community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestKernelPanic.java
community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestNeoStore.java
community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestXa.java
community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TestXaFramework.java
community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/TxManagerTest.java
community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestUpgradeOneDotFourToFiveIT.java
community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLogTest.java
community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/TestLuceneDataSource.java
community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/TestRecovery.java

commit ac0b5f2c8a01aedea4ee7e871fcac4a4bf5c777f
Merge: f9a8dca 4312b55
Author: Chris Vest
Date: Fri Apr 4 16:01:52 2014 +0200

Merge commit '4312b55' into 2.0-merge-1.9

commit f9a8dca4962e2361cf905e1ab91bf8d734c8deca
Merge: 5f25c3a 2fc612c
Author: Chris Vest
Date: Fri Apr 4 16:01:36 2014 +0200

Merge commit '2fc612c' into 2.0-merge-1.9

Conflicts:
community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaResourceManager.java
community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestApplyTransactions.java

commit 5f25c3a9f0be747b8b10d9aadb44ff91b5919d67
Merge: 697d34c 17faab0
Author: Chris Vest
Date: Fri Apr 4 15:57:02 2014 +0200

Merge commit '17faab0' into 2.0-merge-1.9

commit 697d34c4700ce96b20921a5a4f22546f9d2b5ab7
Merge: 8398ca0 da464a3
Author: Chris Vest
Date: Fri Apr 4 15:56:37 2014 +0200

Merge commit 'da464a3' into 2.0-merge-1.9

Conflicts:
community/kernel/CHANGES.txt
community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java
community/server/src/main/java/org/neo4j/server/database/Database.java
enterprise/backup/CHANGES.txt
enterprise/backup/src/main/java/org/neo4j/backup/BackupService.java
enterprise/backup/src/test/java/org/neo4j/backup/BackupToolTest.java

commit 8398ca08a0ffc3319ff0cbe3c0905451a0fd9d97
Merge: f40cbbd e53d8a7
Author: Chris Vest
Date: Fri Apr 4 14:09:54 2014 +0200

Merge commit 'e53d8a7' into 2.0-merge-1.9

commit f40cbbd6c842aa9068e01f0f8978aa1174dd5fcc
Merge: 32dca86 b90d47e
Author: Chris Vest
Date: Fri Apr 4 14:09:37 2014 +0200

Merge commit 'b90d47e' into 2.0-merge-1.9

Conflicts:
community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/TxManager.java
community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaResourceManager.java

commit 32dca86235f0438933b674940d9878f484ddc016
Merge: f2cea5a ea67566
Author: Chris Vest
Date: Fri Apr 4 14:05:40 2014 +0200

Merge commit 'ea67566' into 2.0-merge-1.9

commit f2cea5ad8a000fb290f3c20c262af1e032edaa5a
Merge: fda534e 32ced61
Author: Chris Vest
Date: Fri Apr 4 14:05:24 2014 +0200

Merge commit '32ced61' into 2.0-merge-1.9

commit fda534ece2629dd410fa6020ff4b53e7a9405e7d
Merge: 4965776 00f1fa0
Author: Chris Vest
Date: Fri Apr 4 14:02:45 2014 +0200

Merge commit '00f1fa0' into 2.0-merge-1.9

Conflicts:
advanced/server-advanced/src/test/java/org/neo4j/server/advanced/BootstrapperTest.java
community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseFactory.java
community/kernel/src/main/java/org/neo4j/kernel/EmbeddedGraphDatabase.java
community/kernel/src/main/java/org/neo4j/kernel/EmbeddedReadOnlyGraphDatabase.java
community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
community/kernel/src/main/java/org/neo4j/kernel/impl/util/FileUtils.java
community/kernel/src/main/java/org/neo4j/kernel/logging/BufferingLogger.java
community/kernel/src/main/java/org/neo4j/kernel/logging/Logging.java
community/kernel/src/test/java/org/neo4j/kernel/DiagnosticsLoggingTest.java
community/kernel/src/test/java/org/neo4j/kernel/impl/event/TestKernelPanic.java
community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/ProduceUncleanStore.java
community/kernel/src/test/java/org/neo4j/test/IdJumpingGraphDatabase.java
community/kernel/src/test/java/org/neo4j/test/ImpermanentGraphDatabase.java
community/kernel/src/test/java/org/neo4j/test/TestGraphDatabaseFactory.java
community/neo4j/src/test/java/recovery/TestRecoveryVerification.java
community/server-plugin-test/src/test/java/org/neo4j/server/plugins/PluginManagerTest.java
community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
community/server/src/main/java/org/neo4j/server/CommunityNeoServer.java
community/server/src/main/java/org/neo4j/server/LoggingProvider.java
community/server/src/main/java/org/neo4j/server/WrappingNeoServer.java
community/server/src/main/java/org/neo4j/server/configuration/PropertyFileConfigurator.java
community/server/src/main/java/org/neo4j/server/configuration/ServerConfigurator.java
community/server/src/main/java/org/neo4j/server/database/CommunityDatabase.java
community/server/src/main/java/org/neo4j/server/database/Database.java
community/server/src/main/java/org/neo4j/server/logging/JettyLoggerAdapter.java
community/server/src/main/java/org/neo4j/server/logging/JulAdapter.java
community/server/src/main/java/org/neo4j/server/modules/DiscoveryModule.java
community/server/src/main/java/org/neo4j/server/modules/ManagementApiModule.java
community/server/src/main/java/org/neo4j/server/modules/RESTApiModule.java
community/server/src/main/java/org/neo4j/server/modules/WebAdminModule.java
community/server/src/main/java/org/neo4j/server/rrd/RrdFactory.java
community/server/src/main/java/org/neo4j/server/statistic/StatisticStartupListener.java
community/server/src/main/java/org/neo4j/server/web/Jetty6WebServer.java
community/server/src/test/java/org/neo4j/server/DatabaseTuningDocIT.java
community/server/src/test/java/org/neo4j/server/NeoServerPortConflictDocIT.java
community/server/src/test/java/org/neo4j/server/NeoServerShutdownLoggingDocIT.java
community/server/src/test/java/org/neo4j/server/NeoServerStartupLoggingDocIT.java
community/server/src/test/java/org/neo4j/server/StartupTimeoutDocIT.java
community/server/src/test/java/org/neo4j/server/configuration/PropertyFileConfiguratorTest.java
community/server/src/test/java/org/neo4j/server/database/EphemeralDatabase.java
community/server/src/test/java/org/neo4j/server/database/TestCommunityDatabase.java
community/server/src/test/java/org/neo4j/server/helpers/ServerBuilder.java
community/server/src/test/java/org/neo4j/server/helpers/ServerHelper.java
community/server/src/test/java/org/neo4j/server/modules/DiscoveryModuleTest.java
community/server/src/test/java/org/neo4j/server/modules/RESTApiModuleTest.java
community/server/src/test/java/org/neo4j/server/modules/ThirdPartyJAXRSModuleTest.java
community/server/src/test/java/org/neo4j/server/modules/WebAdminModuleTest.java
community/server/src/test/java/org/neo4j/server/preflight/TestPreflightTasks.java
community/server/src/test/java/org/neo4j/server/rrd/RrdFactoryTest.java
community/server/src/test/java/org/neo4j/server/web/JettyThreadLimitTest.java
community/server/src/test/java/org/neo4j/server/web/TestJetty6WebServer.java
community/server/src/test/java/org/neo4j/server/webadmin/console/CypherSessionDocTest.java
community/server/src/test/java/org/neo4j/server/webadmin/rest/MonitorServiceDocTest.java
enterprise/ha/src/main/java/org/neo4j/graphdb/factory/HighlyAvailableGraphDatabaseFactory.java
enterprise/ha/src/main/java/org/neo4j/kernel/HighlyAvailableGraphDatabase.java
enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighlyAvailableGraphDatabase.java
enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseDatabase.java
enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java
enterprise/server-enterprise/src/main/java/org/neo4j/server/webadmin/rest/MasterInfoServerModule.java
enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/TestEnterpriseDatabase.java
enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java
packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/runtime/DatabaseActions.java
packaging/neo4j-desktop/src/main/java/org/neo4j/desktop/runtime/DesktopConfigurator.java

commit 496577603e2ae59601565695b014d8ba996f73bd
Merge: 20a814a a462796
Author: Chris Vest
Date: Tue Apr 1 14:35:36 2014 +0200

Merge commit 'a462796' into 2.0-merge-1.9

commit 20a814aa0313dbcfe888e140d7613830fc4df923
Merge: ac1e030 3ab47a1
Author: Chris Vest
Date: Tue Apr 1 14:35:27 2014 +0200

Merge commit '3ab47a1' into 2.0-merge-1.9

commit ac1e0309dc1482987cc6cbec66d160eac2c01aeb
Merge: 12ee40b a7608b9
Author: Chris Vest
Date: Tue Apr 1 14:35:14 2014 +0200

Merge commit 'a7608b9' into 2.0-merge-1.9

commit 12ee40bf616d931f2463358c693ac5869e78c521
Merge: 4df4f44 1a728ca
Author: Chris Vest
Date: Tue Apr 1 14:34:50 2014 +0200

Merge commit '1a728ca' into 2.0-merge-1.9

Conflicts:
community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/XaDataSourceManager.java

commit 4df4f446da6716e3242dc2743b2f74d649d81c0c
Merge: b5bdcc5 18fa1b7
Author: Chris Vest
Date: Tue Apr 1 14:31:31 2014 +0200

Merge commit '18fa1b7' into 2.0-merge-1.9

commit b5bdcc51eee709802d30064efd7ad625f8650358
Merge: a8b40a3 1ff629b
Author: Chris Vest
Date: Tue Apr 1 14:30:59 2014 +0200

Merge commit '1ff629b' into 2.0-merge-1.9

Conflicts:
community/server/src/test/java/org/neo4j/server/web/logging/HTTPLoggingDocIT.java

commit a8b40a31f54f4a08f0261976971c3fd3da5ab73c
Merge: 71bd28b bfab2d2
Author: Chris Vest
Date: Tue Apr 1 14:27:28 2014 +0200

Merge commit 'bfab2d2' into 2.0-merge-1.9

commit f26fcad2abe455c2d17248dff6df1392fe482d5e
Merge: 4312b55 38eb5c2
Author: Chris Vest
Date: Tue Apr 1 09:08:07 2014 +0200

Merge pull request #2175 from tinwelint/1.9-apply-tx-kernel-panic

Pulls out "tm ok" state into KernelHealth

commit 38eb5c2e53607917632c671e01cb7b6be6fc8670
Author: Mattias Persson
Date: Fri Mar 21 14:29:55 2014 +0100

Pulls out "tm ok" state into KernelHealth

which is also now shared with XaLogicalLog so that the same rules about
panicing and respecting a kernel panic event also is in place when
applying external transactions.

commit 4312b5540fc277f42bc1a4982fb3fcd31ed83ddc
Merge: 17faab0 2fc612c
Author: Jacob Hansson
Date: Mon Mar 31 16:09:46 2014 +0200

Merge pull request #2201 from chrisvest/1.9-fix-txordermap-memory-leak

Fix memory leak in XaResourceManager.

commit 2fc612c06150132f630a35b7894449631b9c81a6
Author: Chris Vest
Date: Mon Mar 31 14:04:16 2014 +0200

Fix memory leak in XaResourceManager.

The txOrderMap was initially only meant for and used by recovery. However, HA started
injecting transactions using the same recovery code as well. This meant that the
txOrderMap was steadily accumulating data, but never got cleared, because the clearing
only happened at the end of recovery.

This memory leak has been fixed by removing the txOrderMap completely, and instead let
the TransactionStatus objects know how to order themselves.

commit 17faab06a8eb9a5c34d14902a5b2d00855b46c7e
Merge: e53d8a7 da464a3
Author: Chris Vest
Date: Sat Mar 29 15:57:48 2014 +0100

Merge pull request #2182 from jakewins/1.9-backup-usability

Added support for fallback to full backup when incremental fails

commit da464a3e02f7e0b1d62e3c49437078922a0e5230
Author: Jacob Hansson
Date: Thu Mar 27 14:53:28 2014 +0100

Added support for fallback to full backup when incremental fails
o OnlineBackup support for new default backup behavior.
o Backup tool now handles old backups which cannot do incremental anymore.

commit e53d8a77bc532659f4ba47dc2f640011f153ff0d
Merge: ea67566 b90d47e
Author: Jacob Hansson
Date: Wed Mar 26 10:17:41 2014 +0100

Merge pull request #2165 from chrisvest/1.9-forcemode-importance

Add some comments to clarify some important subtleties for the synchronization of TxManager.

commit b90d47ee2e1d7367d59e0c339f6b741636405186
Author: Chris Vest
Date: Tue Mar 25 12:05:41 2014 +0100

Add some comments to clarify some important subtleties for the synchronization of TxManager.

commit ea67566fc26bffaf0551e668542dd05be167c428
Author: Ben Butler-Cole
Date: Mon Mar 24 15:35:37 2014 +0000

Revert "Specify Java subprocess is headless. Needed on OSX with Java 1.6 only."

Found a better way to do this. If we use MAVEN_OPTS to set the headless
property then it is inherited by subprocesses.

This reverts commit a462796552f1dba45ca4671b42009ee9244c7d0a.

commit 32ced61601cfa4865023bd934bce685257ad9421
Merge: a462796 00f1fa0
Author: Chris Vest
Date: Mon Mar 24 16:13:39 2014 +0100

Merge pull request #2125 from tinwelint/1.9-server-logging

Server can dictate which logging kernel uses

commit a462796552f1dba45ca4671b42009ee9244c7d0a
Author: Ben Butler-Cole
Date: Mon Mar 24 15:01:39 2014 +0000

Specify Java subprocess is headless. Needed on OSX with Java 1.6 only.

commit 3ab47a1bc4b5f22fe6c9f53d8bfee18701c0133b
Author: Ben Butler-Cole
Date: Mon Mar 24 14:42:28 2014 +0000

Don't swallow output in problematic test.

TestRecovery is failing on OSX under TeamCity. We need to avoid throwing
away the output from the subprocess so that we can diagnose the problem.

commit a7608b9d60b79f8fe366c2f02ca1a75ab0f0d926
Merge: 18fa1b7 1a728ca
Author: Chris Vest
Date: Mon Mar 24 14:42:16 2014 +0100

Merge pull request #2159 from benbc/1.9-dont-access-resources-during-shutdown

Don't access resources during shutdown.

commit 00f1fa0c1b23fd75b33d09e6214aee104f38dde7
Author: Mattias Persson
Date: Mon Mar 17 11:33:26 2014 +0100

Server can dictate which logging kernel uses

And will, in the server setup, have server and kernel use the same logging mechanisms.
This commit also removes usages of java.util.logging from server in favor
of the console logger in kernel.

commit 18fa1b77a9eadebad8392f4507d995cbd0cad13e
Author: Ben Butler-Cole
Date: Mon Mar 24 13:16:20 2014 +0000

Isolate HTTPLoggingDocIT from other tests that use the shared server.

o Server tests that create their own server need to extend
ExclusiveServerTestBase in order to ensure that the shared server is
not running while they execute.
o HTTPLoggingDocIT runs its own server because it needs specific
configuration.

commit 1ff629b1daeb5edb4593567c86a9b22d42056601
Author: Ben Butler-Cole
Date: Mon Mar 24 12:11:51 2014 +0000

Remove a catch block that was suppressing failures in a test and make the test more robust.

The catch block in HTTPLoggingDocIT was suppressing all failures. Once
it had been removed it became apparent that the test was
flaky. Specifically it almost always failed in my IDE when run
alone (although it passed when run with the other tests in the file). I
believe the flakiness was because the log file wasn't always flushed to
disk before the assertion was reached.

commit 1a728cacc486b3446e4690d1c3cd62a2f35ef86d
Author: Ben Butler-Cole
Date: Mon Mar 24 10:44:11 2014 +0000

Don't access resources during shutdown.

The XaDataSourceManager was creating new resources in
unregisterDataSource(). When this method is called during shutdown,
other components may already have been shut down so the resource
creation may fail.

The particular case we saw was a race condition shutting down during a
master switch, which caused a NullPointerException in
XaConnectionHelperImpl when LuceneDataSource tried to create a
LuceneXaResource with a null XaResourceManager (which had been nulled
out during the master switch).

commit bfab2d2ad0d3e9203da294baadd48862ee4ed349
Author: Ben Butler-Cole
Date: Fri Mar 21 16:58:43 2014 +0000

Fix exception merging to be compatible with Java 1.6.