honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Simon Willnauer 2015-12-09 10:36:25 +01:00
parent 3d946871e8
commit 83ef665cba
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java
View File

@ -94,7 +94,7 @@ public class BalancedShardsAllocator extends AbstractComponent implements Shards
}
public void setWeightFunction(float indexBalance, float shardBalanceFactor) {
weightFunction = new WeightFunction(indexBalance, weightFunction.shardBalance);
weightFunction = new WeightFunction(indexBalance, shardBalanceFactor);
}

3
core/src/test/java/org/elasticsearch/threadpool/UpdateThreadPoolSettingsTests.java
View File

@ -101,8 +101,9 @@ public class UpdateThreadPoolSettingsTests extends ESTestCase {
);
fail("expected IllegalArgumentException");
} catch (IllegalArgumentException e) {
assertEquals("illegal value can't update [threadpool.] from [{}] to [{" + threadPoolName + ".type=" + invalidThreadPoolType.getType() + "}]", e.getMessage());
assertThat(
e.getMessage(),
e.getCause().getMessage(),
is("setting threadpool." + threadPoolName + ".type to " + invalidThreadPoolType.getType() + " is not permitted; must be " + validThreadPoolType.getType()));
} finally {
terminateThreadPoolIfNeeded(threadPool);