This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git.
from 478665f Revert "GEODE-1920 Addition of more logs to the test"
add 080730b GEODE-3801: Use hardlinks for backup oplog files (#963)
add 11a385e GEODE-3940: fix deadlock in backup messages
add ad786a5 Merge remote-tracking branch 'origin/develop' into
feature/GEODE-3940
new d59c730 Merge pull request #1053 from apache/feature/GEODE-3940
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../admin/internal/AdminDistributedSystemImpl.java | 2 +-
.../geode/admin/internal/FinishBackupRequest.java | 174 --
.../geode/admin/internal/FinishBackupResponse.java | 76 -
.../geode/admin/internal/FlushToDiskRequest.java | 92 -
.../geode/admin/internal/PrepareBackupRequest.java | 134 --
.../org/apache/geode/distributed/internal/DM.java | 145 +-
.../internal/DistributionMessageObserver.java | 16 +-
.../internal/LonerDistributionManager.java | 19 +
.../org/apache/geode/internal/DSFIDFactory.java | 19 +-
.../geode/internal/DataSerializableFixedID.java | 2 +-
.../org/apache/geode/internal/SystemAdmin.java | 2 +-
.../admin/remote/AddHealthListenerRequest.java | 2 +-
.../admin/remote/AddHealthListenerResponse.java | 4 +-
.../admin/remote/AddStatListenerRequest.java | 4 +-
.../admin/remote/AddStatListenerResponse.java | 4 +-
.../admin/remote/AdminFailureResponse.java | 36 +-
.../admin/remote/AdminMultipleReplyProcessor.java | 51 +-
.../geode/internal/admin/remote/AdminRequest.java | 5 +-
.../internal/admin/remote/BridgeServerRequest.java | 4 +-
.../admin/remote/BridgeServerResponse.java | 4 +-
.../internal/admin/remote/CacheConfigRequest.java | 2 +-
.../internal/admin/remote/CacheConfigResponse.java | 6 +-
.../internal/admin/remote/CacheInfoRequest.java | 4 +-
.../internal/admin/remote/CacheInfoResponse.java | 5 +-
.../admin/remote/CancelStatListenerRequest.java | 2 +-
.../admin/remote/CancelStatListenerResponse.java | 4 +-
.../internal/admin/remote/CliLegacyMessage.java | 3 +-
.../internal/admin/remote/CompactRequest.java | 13 +-
.../admin/remote/DurableClientInfoRequest.java | 4 +-
.../admin/remote/DurableClientInfoResponse.java | 6 +-
.../admin/remote/FetchDistLockInfoRequest.java | 4 +-
.../admin/remote/FetchDistLockInfoResponse.java | 3 +-
.../admin/remote/FetchHealthDiagnosisRequest.java | 2 +-
.../admin/remote/FetchHealthDiagnosisResponse.java | 4 +-
.../internal/admin/remote/FetchHostRequest.java | 2 +-
.../internal/admin/remote/FetchHostResponse.java | 5 +-
.../remote/FetchResourceAttributesRequest.java | 2 +-
.../remote/FetchResourceAttributesResponse.java | 29 +-
.../internal/admin/remote/FetchStatsRequest.java | 2 +-
.../internal/admin/remote/FetchStatsResponse.java | 20 +-
.../internal/admin/remote/FetchSysCfgRequest.java | 2 +-
.../internal/admin/remote/FetchSysCfgResponse.java | 3 +-
.../internal/admin/remote/LicenseInfoRequest.java | 4 +-
.../internal/admin/remote/LicenseInfoResponse.java | 9 +-
.../admin/remote/MissingPersistentIDsRequest.java | 13 +-
.../admin/remote/ObjectDetailsRequest.java | 4 +-
.../admin/remote/ObjectDetailsResponse.java | 3 +-
.../internal/admin/remote/ObjectNamesRequest.java | 4 +-
.../internal/admin/remote/ObjectNamesResponse.java | 3 +-
.../remote/PrepareRevokePersistentIDRequest.java | 3 +-
.../admin/remote/RefreshMemberSnapshotRequest.java | 2 +-
.../remote/RefreshMemberSnapshotResponse.java | 5 +-
.../admin/remote/RegionAttributesRequest.java | 4 +-
.../admin/remote/RegionAttributesResponse.java | 4 +-
.../geode/internal/admin/remote/RegionRequest.java | 4 +-
.../internal/admin/remote/RegionResponse.java | 2 +-
.../internal/admin/remote/RegionSizeRequest.java | 4 +-
.../internal/admin/remote/RegionSizeResponse.java | 3 +-
.../admin/remote/RegionStatisticsRequest.java | 2 +-
.../admin/remote/RegionStatisticsResponse.java | 4 +-
.../admin/remote/RegionSubRegionSizeRequest.java | 4 +-
.../admin/remote/RegionSubRegionsSizeResponse.java | 7 +-
.../admin/remote/RemoveHealthListenerRequest.java | 2 +-
.../admin/remote/RemoveHealthListenerResponse.java | 4 +-
.../admin/remote/ResetHealthStatusRequest.java | 4 +-
.../admin/remote/ResetHealthStatusResponse.java | 4 +-
.../admin/remote/RevokePersistentIDRequest.java | 3 +-
.../internal/admin/remote/RootRegionRequest.java | 2 +-
.../internal/admin/remote/RootRegionResponse.java | 5 +-
.../internal/admin/remote/ShutdownAllRequest.java | 4 +-
.../internal/admin/remote/StoreSysCfgRequest.java | 2 +-
.../internal/admin/remote/StoreSysCfgResponse.java | 3 +-
.../internal/admin/remote/SubRegionRequest.java | 4 +-
.../internal/admin/remote/SubRegionResponse.java | 3 +-
.../internal/admin/remote/TailLogRequest.java | 2 +-
.../internal/admin/remote/TailLogResponse.java | 5 +-
.../internal/admin/remote/VersionInfoRequest.java | 4 +-
.../internal/admin/remote/VersionInfoResponse.java | 3 +-
.../geode/internal/cache/DirectoryHolder.java | 2 +-
.../geode/internal/cache/DiskStoreBackup.java | 2 -
.../geode/internal/cache/DiskStoreFactoryImpl.java | 1 +
.../apache/geode/internal/cache/DiskStoreImpl.java | 10 +-
.../geode/internal/cache/GemFireCacheImpl.java | 5 +-
.../apache/geode/internal/cache/InternalCache.java | 1 +
.../geode/internal/cache/InternalRegion.java | 4 +
.../apache/geode/internal/cache/LocalRegion.java | 1 +
.../org/apache/geode/internal/cache/Oplog.java | 44 +-
.../internal/cache/PartitionedRegionDataStore.java | 1 +
.../cache/backup}/BackupDataStoreHelper.java | 21 +-
.../cache/backup}/BackupDataStoreResult.java | 2 +-
.../{persistence => backup}/BackupInspector.java | 2 +-
.../internal/cache/{ => backup}/BackupLock.java | 45 +-
.../internal/cache/{ => backup}/BackupManager.java | 50 +-
.../internal/cache/backup/BackupOperation.java | 85 +
.../cache/backup/BackupReplyProcessor.java | 59 +
.../cache/backup/BackupResponse.java} | 29 +-
.../cache/backup/BackupResultCollector.java} | 16 +-
.../internal/cache/{ => backup}/BackupUtil.java | 4 +-
.../geode/internal/cache/backup/FinishBackup.java | 47 +
.../internal/cache/backup/FinishBackupFactory.java | 49 +
.../cache/backup/FinishBackupOperation.java | 75 +
.../internal/cache/backup/FinishBackupRequest.java | 100 +
.../geode/internal/cache/backup/FlushToDisk.java} | 23 +-
.../cache/backup/FlushToDiskFactory.java} | 35 +-
.../cache/backup/FlushToDiskOperation.java | 87 +
.../cache/backup/FlushToDiskProcessor.java} | 31 +-
.../internal/cache/backup/FlushToDiskRequest.java | 57 +
.../cache/backup}/FlushToDiskResponse.java | 2 +-
.../cache/backup/PrepareBackup.java} | 39 +-
.../cache/backup/PrepareBackupFactory.java | 45 +
.../cache/backup/PrepareBackupOperation.java | 64 +
.../cache/backup/PrepareBackupRequest.java | 73 +
.../{persistence => backup}/RestoreScript.java | 2 +-
.../{persistence => backup}/ScriptGenerator.java | 2 +-
.../UnixBackupInspector.java | 2 +-
.../UnixScriptGenerator.java | 5 +-
.../WindowsBackupInspector.java | 2 +-
.../WindowsScriptGenerator.java | 3 +-
.../cache/persistence/PersistentMemberManager.java | 8 +-
.../internal/cache/xmlcache/CacheCreation.java | 2 +-
.../org/apache/geode/management/BackupStatus.java | 7 +-
.../internal/beans/DistributedSystemBridge.java | 4 +-
.../internal/beans/MemberMBeanBridge.java | 2 +-
.../cli/commands/BackupDiskStoreCommand.java | 2 +-
.../internal/messages/CompactRequest.java | 12 +-
.../cache/Bug34179TooManyFilesOpenJUnitTest.java | 2 +-
.../internal/cache/DiskRegRecoveryJUnitTest.java | 2 +-
.../cache/DiskRegionAsyncRecoveryJUnitTest.java | 2 +-
.../internal/cache/DiskRegionHelperFactory.java | 109 +-
.../geode/internal/cache/DiskRegionJUnitTest.java | 6 +-
.../internal/cache/DiskRegionTestingBase.java | 118 +-
.../geode/internal/cache/OplogJUnitTest.java | 2235 ++------------------
.../internal/cache/SimpleDiskRegionJUnitTest.java | 2 +-
.../BackupDistributedTest.java} | 590 +++---
.../BackupInspectorIntegrationTest.java | 2 +-
.../BackupIntegrationTest.java} | 29 +-
.../internal/cache/backup/BackupLockTest.java | 105 +
.../BackupPrepareAndFinishMsgDUnitTest.java | 20 +-
.../cache/backup/BackupReplyProcessorTest.java | 90 +
.../cache/backup/FinishBackupFactoryTest.java | 87 +
.../cache/backup/FinishBackupOperationTest.java | 236 +++
.../cache/backup/FinishBackupRequestTest.java | 117 +
.../cache/backup/FlushToDiskFactoryTest.java | 83 +
.../cache/backup/FlushToDiskOperationTest.java | 121 ++
.../cache/backup/FlushToDiskRequestTest.java | 82 +
.../IncrementalBackupDistributedTest.java} | 17 +-
...titionedBackupPrepareAndFinishMsgDUnitTest.java | 5 +-
.../cache/backup/PrepareBackupFactoryTest.java | 85 +
.../cache/backup/PrepareBackupOperationTest.java | 232 ++
.../cache/backup/PrepareBackupRequestTest.java | 98 +
...eplicateBackupPrepareAndFinishMsgDUnitTest.java | 5 +-
.../UnixScriptGeneratorTest.java | 2 +-
.../WindowsScriptGeneratorTest.java | 2 +-
...skRegionOverflowAsyncRollingOpLogJUnitTest.java | 4 +-
...iskRegionOverflowSyncRollingOpLogJUnitTest.java | 4 +-
.../DiskRegionPerfJUnitPerformanceTest.java | 2 +-
.../DiskRegionRollOpLogJUnitPerformanceTest.java | 2 +-
.../cache/partitioned/PersistPRKRFDUnitTest.java | 36 +-
...sistentColocatedPartitionedRegionDUnitTest.java | 226 +-
.../PersistentPartitionedRegionDUnitTest.java | 118 +-
.../PersistentPartitionedRegionTestBase.java | 961 ++++-----
...tPartitionedRegionWithTransactionDUnitTest.java | 28 +-
.../PersistentRecoveryOrderDUnitTest.java | 2 +-
.../beans/DistributedSystemBridgeJUnitTest.java | 8 +-
.../pdx/ClientsWithVersioningRetryDUnitTest.java | 4 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 2 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 8 +-
.../BackupIntegrationTest.cache.xml} | 0
168 files changed, 3832 insertions(+), 4285 deletions(-)
delete mode 100644
geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
delete mode 100644
geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupResponse.java
delete mode 100644
geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskRequest.java
delete mode 100644
geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
rename geode-core/src/main/java/org/apache/geode/{admin/internal =>
internal/cache/backup}/BackupDataStoreHelper.java (70%)
rename geode-core/src/main/java/org/apache/geode/{admin/internal =>
internal/cache/backup}/BackupDataStoreResult.java (97%)
rename geode-core/src/main/java/org/apache/geode/internal/cache/{persistence
=> backup}/BackupInspector.java (99%)
rename geode-core/src/main/java/org/apache/geode/internal/cache/{ =>
backup}/BackupLock.java (76%)
rename geode-core/src/main/java/org/apache/geode/internal/cache/{ =>
backup}/BackupManager.java (93%)
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/BackupOperation.java
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/BackupReplyProcessor.java
rename
geode-core/src/main/java/org/apache/geode/{admin/internal/PrepareBackupResponse.java
=> internal/cache/backup/BackupResponse.java} (75%)
copy
geode-core/src/{test/java/org/apache/geode/internal/cache/persistence/ReplicateBackupPrepareAndFinishMsgDUnitTest.java
=>
main/java/org/apache/geode/internal/cache/backup/BackupResultCollector.java}
(64%)
rename geode-core/src/main/java/org/apache/geode/internal/cache/{ =>
backup}/BackupUtil.java (94%)
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/FinishBackup.java
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/FinishBackupFactory.java
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/FinishBackupOperation.java
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/FinishBackupRequest.java
copy
geode-core/src/{test/java/org/apache/geode/internal/cache/persistence/ReplicateBackupPrepareAndFinishMsgDUnitTest.java
=> main/java/org/apache/geode/internal/cache/backup/FlushToDisk.java} (64%)
copy
geode-core/src/main/java/org/apache/geode/{admin/internal/FlushToDiskResponse.java
=> internal/cache/backup/FlushToDiskFactory.java} (51%)
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/FlushToDiskOperation.java
copy
geode-core/src/main/java/org/apache/geode/{admin/internal/FlushToDiskResponse.java
=> internal/cache/backup/FlushToDiskProcessor.java} (57%)
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/FlushToDiskRequest.java
copy geode-core/src/main/java/org/apache/geode/{admin/internal =>
internal/cache/backup}/FlushToDiskResponse.java (96%)
rename
geode-core/src/main/java/org/apache/geode/{admin/internal/FlushToDiskResponse.java
=> internal/cache/backup/PrepareBackup.java} (55%)
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupFactory.java
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupOperation.java
create mode 100644
geode-core/src/main/java/org/apache/geode/internal/cache/backup/PrepareBackupRequest.java
rename geode-core/src/main/java/org/apache/geode/internal/cache/{persistence
=> backup}/RestoreScript.java (99%)
rename geode-core/src/main/java/org/apache/geode/internal/cache/{persistence
=> backup}/ScriptGenerator.java (96%)
rename geode-core/src/main/java/org/apache/geode/internal/cache/{persistence
=> backup}/UnixBackupInspector.java (97%)
rename geode-core/src/main/java/org/apache/geode/internal/cache/{persistence
=> backup}/UnixScriptGenerator.java (93%)
rename geode-core/src/main/java/org/apache/geode/internal/cache/{persistence
=> backup}/WindowsBackupInspector.java (98%)
rename geode-core/src/main/java/org/apache/geode/internal/cache/{persistence
=> backup}/WindowsScriptGenerator.java (97%)
rename
geode-core/src/test/java/org/apache/geode/internal/cache/{BackupDUnitTest.java
=> backup/BackupDistributedTest.java} (59%)
rename geode-core/src/test/java/org/apache/geode/internal/cache/{persistence
=> backup}/BackupInspectorIntegrationTest.java (99%)
rename
geode-core/src/test/java/org/apache/geode/internal/cache/{BackupJUnitTest.java
=> backup/BackupIntegrationTest.java} (93%)
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupLockTest.java
rename geode-core/src/test/java/org/apache/geode/internal/cache/{persistence
=> backup}/BackupPrepareAndFinishMsgDUnitTest.java (93%)
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/BackupReplyProcessorTest.java
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupFactoryTest.java
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupOperationTest.java
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/FinishBackupRequestTest.java
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskFactoryTest.java
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskOperationTest.java
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/FlushToDiskRequestTest.java
rename
geode-core/src/test/java/org/apache/geode/internal/cache/{IncrementalBackupDUnitTest.java
=> backup/IncrementalBackupDistributedTest.java} (98%)
rename geode-core/src/test/java/org/apache/geode/internal/cache/{persistence
=> backup}/PartitionedBackupPrepareAndFinishMsgDUnitTest.java (85%)
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupFactoryTest.java
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupOperationTest.java
create mode 100644
geode-core/src/test/java/org/apache/geode/internal/cache/backup/PrepareBackupRequestTest.java
rename geode-core/src/test/java/org/apache/geode/internal/cache/{persistence
=> backup}/ReplicateBackupPrepareAndFinishMsgDUnitTest.java (85%)
rename geode-core/src/test/java/org/apache/geode/internal/cache/{persistence
=> backup}/UnixScriptGeneratorTest.java (98%)
rename geode-core/src/test/java/org/apache/geode/internal/cache/{persistence
=> backup}/WindowsScriptGeneratorTest.java (98%)
rename
geode-core/src/test/resources/org/apache/geode/internal/cache/{BackupJUnitTest.cache.xml
=> backup/BackupIntegrationTest.cache.xml} (100%)
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
