honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compare with .bytes() instead of ByteSizeValue.equals() in breaker service

This commit is contained in:
Lee Hinman 2014-03-12 08:41:09 -06:00
parent 76e92ffbea
commit e7ddef9974
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/elasticsearch/indices/fielddata/breaker/InternalCircuitBreakerService.java
View File

@ -41,16 +41,16 @@ public class InternalCircuitBreakerService extends AbstractLifecycleComponent<In
private static final String DEFAULT_BREAKER_LIMIT = "80%"; private static final String DEFAULT_BREAKER_LIMIT = "80%";
private volatile MemoryCircuitBreaker breaker; private volatile MemoryCircuitBreaker breaker;
private volatile ByteSizeValue maxBytes; private volatile long maxBytes;
private volatile double overhead; private volatile double overhead;
@Inject @Inject
public InternalCircuitBreakerService(Settings settings, NodeSettingsService nodeSettingsService) { public InternalCircuitBreakerService(Settings settings, NodeSettingsService nodeSettingsService) {
super(settings); super(settings);
this.maxBytes = settings.getAsMemory(CIRCUIT_BREAKER_MAX_BYTES_SETTING, DEFAULT_BREAKER_LIMIT); this.maxBytes = settings.getAsMemory(CIRCUIT_BREAKER_MAX_BYTES_SETTING, DEFAULT_BREAKER_LIMIT).bytes();
this.overhead = settings.getAsDouble(CIRCUIT_BREAKER_OVERHEAD_SETTING, DEFAULT_OVERHEAD_CONSTANT); this.overhead = settings.getAsDouble(CIRCUIT_BREAKER_OVERHEAD_SETTING, DEFAULT_OVERHEAD_CONSTANT);
this.breaker = new MemoryCircuitBreaker(maxBytes, overhead, null, logger); this.breaker = new MemoryCircuitBreaker(new ByteSizeValue(maxBytes), overhead, null, logger);
nodeSettingsService.addListener(new ApplySettings()); nodeSettingsService.addListener(new ApplySettings());
} }
@ -59,12 +59,13 @@ public class InternalCircuitBreakerService extends AbstractLifecycleComponent<In
@Override @Override
public void onRefreshSettings(Settings settings) { public void onRefreshSettings(Settings settings) {
// clear breaker now that settings have changed // clear breaker now that settings have changed
ByteSizeValue newMaxByteSizeValue = settings.getAsMemory(CIRCUIT_BREAKER_MAX_BYTES_SETTING, maxBytes.toString()); long newMaxByteSizeValue = settings.getAsMemory(CIRCUIT_BREAKER_MAX_BYTES_SETTING, Long.toString(maxBytes)).bytes();
boolean breakerResetNeeded = false; boolean breakerResetNeeded = false;
if (!newMaxByteSizeValue.equals(maxBytes)) { if (newMaxByteSizeValue != maxBytes) {
logger.info("updating [{}] from [{}] to [{}]", CIRCUIT_BREAKER_MAX_BYTES_SETTING, logger.info("updating [{}] from [{}]({}) to [{}]({})", CIRCUIT_BREAKER_MAX_BYTES_SETTING,
InternalCircuitBreakerService.this.maxBytes, newMaxByteSizeValue.bytes()); InternalCircuitBreakerService.this.maxBytes, new ByteSizeValue(InternalCircuitBreakerService.this.maxBytes),
newMaxByteSizeValue, new ByteSizeValue(newMaxByteSizeValue));
maxBytes = newMaxByteSizeValue; maxBytes = newMaxByteSizeValue;
breakerResetNeeded = true; breakerResetNeeded = true;
} }
@ -99,7 +100,7 @@ public class InternalCircuitBreakerService extends AbstractLifecycleComponent<In
public synchronized void resetBreaker() { public synchronized void resetBreaker() {
final MemoryCircuitBreaker oldBreaker = this.breaker; final MemoryCircuitBreaker oldBreaker = this.breaker;
// discard old breaker by creating a new one and pre-populating from the current breaker // discard old breaker by creating a new one and pre-populating from the current breaker
this.breaker = new MemoryCircuitBreaker(maxBytes, overhead, oldBreaker, logger); this.breaker = new MemoryCircuitBreaker(new ByteSizeValue(maxBytes), overhead, oldBreaker, logger);
} }
@Override @Override