janhoy commented on a change in pull request #193:
URL: https://github.com/apache/solr/pull/193#discussion_r659568848
##########
File path:
solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
##########
@@ -33,16 +33,32 @@
public abstract class CircuitBreaker {
public static final String NAME = "circuitbreaker";
+ @Deprecated
protected final CircuitBreakerConfig config;
+ protected boolean enabled = false;
+
+ public CircuitBreaker() {
+ this.config = null;
+ }
+
+ @Deprecated
public CircuitBreaker(CircuitBreakerConfig config) {
this.config = config;
}
// Global config for all circuit breakers. For specific circuit breaker
configs, define
// your own config.
protected boolean isEnabled() {
- return config.isEnabled();
+ if (config != null) {
Review comment:
can be simplified `return enabled || (config != null &&
config.isEnabled())`
##########
File path:
solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
##########
@@ -33,16 +33,32 @@
public abstract class CircuitBreaker {
public static final String NAME = "circuitbreaker";
+ @Deprecated
protected final CircuitBreakerConfig config;
+ protected boolean enabled = false;
+
+ public CircuitBreaker() {
+ this.config = null;
+ }
+
+ @Deprecated
Review comment:
Consider adding `since` and `forRemoval` args to Deprecated annotations
##########
File path:
solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
##########
@@ -49,18 +51,6 @@ public CircuitBreakerManager(final boolean
enableCircuitBreakerManager) {
this.enableCircuitBreakerManager = enableCircuitBreakerManager;
}
- @Override
Review comment:
Isn't this a breaking change? If someone implemented their own
circuitBreakerManager?
##########
File path:
solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
##########
@@ -135,15 +125,61 @@ public static String toErrorMessage(List<CircuitBreaker>
circuitBreakerList) {
*
* Any default circuit breakers should be registered here.
*/
+ @Deprecated
public static CircuitBreakerManager build(PluginInfo pluginInfo) {
+ return build(pluginInfo, null);
+ }
+
+ /**
+ * TODO
+ */
+ public static CircuitBreakerManager build(PluginInfo pluginInfo,
SolrResourceLoader solrResourceLoader) {
boolean enabled = pluginInfo == null ? false :
Boolean.parseBoolean(pluginInfo.attributes.getOrDefault("enabled", "false"));
CircuitBreakerManager circuitBreakerManager = new
CircuitBreakerManager(enabled);
- circuitBreakerManager.init(pluginInfo);
+ circuitBreakerManager.init(pluginInfo, solrResourceLoader);
return circuitBreakerManager;
}
+ /**
+ * Initialize with circuit breakers defined in the configuration
+ */
+ public void init(PluginInfo pluginInfo, SolrResourceLoader
solrResourceLoader) {
Review comment:
Did you consider `implements ResourceLoaderAware PluginInfoInitialized`
annotations instead of hardwired init in CC?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
