Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/95d7f186 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/95d7f186 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/95d7f186 Branch: refs/heads/feature/GEODE-77 Commit: 95d7f186e35e9865e815130494e8d8c52b97b59b Parents: ad038b3 abb7755 Author: kbachhav <kbachhav.pivotal.io> Authored: Wed Jul 15 17:14:40 2015 +0530 Committer: kbachhav <kbachhav.pivotal.io> Committed: Wed Jul 15 17:14:40 2015 +0530 ---------------------------------------------------------------------- .../jgroup/JGroupMembershipManager.java | 2 +- .../gemfire/internal/cache/DiskEntry.java | 15 +- .../gemfire/internal/cache/DiskRegion.java | 9 + .../gemfire/internal/cache/DiskRegionStats.java | 22 ++ .../internal/cache/PartitionedRegion.java | 1 + .../internal/cache/PartitionedRegionStats.java | 12 +- .../cache/control/InternalResourceManager.java | 15 +- .../control/PartitionRebalanceDetailsImpl.java | 8 +- .../cache/control/RebalanceOperationImpl.java | 157 +++++++++---- .../cache/control/RebalanceResultsImpl.java | 16 +- .../PartitionedRegionRebalanceOp.java | 100 +++++--- .../partitioned/rebalance/BucketOperator.java | 46 +++- .../rebalance/ParallelBucketOperator.java | 145 ++++++++++++ .../rebalance/PartitionedRegionLoadModel.java | 45 +++- .../rebalance/SatisfyRedundancy.java | 7 +- .../rebalance/SatisfyRedundancyFPR.java | 1 + .../rebalance/SimulatedBucketOperator.java | 11 +- .../control/RebalanceOperationDUnitTest.java | 232 ++++++++++++++++++- .../PartitionedRegionLoadModelJUnitTest.java | 97 +++++++- .../gemstone/org/jgroups/protocols/FRAG2.java | 2 +- .../gemstone/org/jgroups/protocols/SMACK.java | 3 +- .../gemstone/org/jgroups/protocols/UDP_NIO.java | 4 +- .../org/jgroups/protocols/VIEW_ENFORCER.java | 2 +- 23 files changed, 824 insertions(+), 128 deletions(-) ----------------------------------------------------------------------
