You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/01/24 17:52:41 UTC
lucene-solr:branch_7x: SOLR-11889: Reset disk space when deleting
collections. Use constants.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x bb1fced56 -> 4a7dcdc4a
SOLR-11889: Reset disk space when deleting collections. Use constants.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4a7dcdc4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4a7dcdc4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4a7dcdc4
Branch: refs/heads/branch_7x
Commit: 4a7dcdc4a452d87a66ebfae7016bc0112f675580
Parents: bb1fced
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Wed Jan 24 18:40:45 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Wed Jan 24 18:52:31 2018 +0100
----------------------------------------------------------------------
.../solr/cloud/autoscaling/sim/SimCloudManager.java | 4 +++-
.../cloud/autoscaling/sim/SimClusterStateProvider.java | 13 ++++++++-----
2 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a7dcdc4/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
index 2310a14..c65a676 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimCloudManager.java
@@ -107,6 +107,8 @@ public class SimCloudManager implements SolrCloudManager {
private SolrResourceLoader loader;
private static int nodeIdPort = 10000;
+ public static int DEFAULT_DISK = 1000; // 1000 GB
+ public static int DEFAULT_IDX_SIZE_BYTES = 1000000000; // 1 GB
/**
* Create a simulated cluster. This cluster uses the following components:
@@ -227,7 +229,7 @@ public class SimCloudManager implements SolrCloudManager {
values.put(ImplicitSnitch.PORT, port);
values.put(ImplicitSnitch.NODE, nodeId);
values.put(ImplicitSnitch.CORES, 0);
- values.put(ImplicitSnitch.DISK, 1000);
+ values.put(ImplicitSnitch.DISK, DEFAULT_DISK);
values.put(ImplicitSnitch.SYSLOADAVG, 1.0);
values.put(ImplicitSnitch.HEAPUSAGE, 123450000);
values.put("sysprop.java.version", System.getProperty("java.version"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4a7dcdc4/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
index f989836..19ccc51 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/SimClusterStateProvider.java
@@ -397,7 +397,7 @@ public class SimClusterStateProvider implements ClusterStateProvider {
// mark replica as active
replicaInfo.getVariables().put(ZkStateReader.STATE_PROP, Replica.State.ACTIVE.toString());
// add a property expected in tests
- replicaInfo.getVariables().put(Suggestion.coreidxsize, 123450000);
+ replicaInfo.getVariables().put(Suggestion.coreidxsize, SimCloudManager.DEFAULT_IDX_SIZE_BYTES);
replicas.add(replicaInfo);
// at this point nuke our cached DocCollection state
@@ -414,9 +414,9 @@ public class SimClusterStateProvider implements ClusterStateProvider {
cloudManager.getSimNodeStateProvider().simSetNodeValue(nodeId, ImplicitSnitch.CORES, cores + 1);
Integer disk = (Integer)values.get(ImplicitSnitch.DISK);
if (disk == null) {
- disk = 1000;
+ disk = SimCloudManager.DEFAULT_DISK;
}
- cloudManager.getSimNodeStateProvider().simSetNodeValue(nodeId, ImplicitSnitch.DISK, disk - 10);
+ cloudManager.getSimNodeStateProvider().simSetNodeValue(nodeId, ImplicitSnitch.DISK, disk - 1);
if (runLeaderElection) {
simRunLeaderElection(Collections.singleton(replicaInfo.getCollection()), true);
}
@@ -452,7 +452,7 @@ public class SimClusterStateProvider implements ClusterStateProvider {
if (disk == null || disk == 0) {
throw new Exception("Unexpected value of 'freedisk' (" + disk + ") on node: " + nodeId);
}
- cloudManager.getSimNodeStateProvider().simSetNodeValue(nodeId, ImplicitSnitch.DISK, disk + 10);
+ cloudManager.getSimNodeStateProvider().simSetNodeValue(nodeId, ImplicitSnitch.DISK, disk + 1);
}
LOG.trace("-- simRemoveReplica {}", ri);
simRunLeaderElection(Collections.singleton(ri.getCollection()), true);
@@ -725,7 +725,10 @@ public class SimClusterStateProvider implements ClusterStateProvider {
collProperties.clear();
sliceProperties.clear();
leaderThrottles.clear();
- cloudManager.getSimNodeStateProvider().simGetAllNodeValues().forEach((n, values) -> values.put("cores", 0));
+ cloudManager.getSimNodeStateProvider().simGetAllNodeValues().forEach((n, values) -> {
+ values.put(ImplicitSnitch.CORES, 0);
+ values.put(ImplicitSnitch.DISK, 1000);
+ });
collectionsStatesRef.set(null);
} finally {
lock.unlock();