*/
package org.opendaylight.controller.config.manager.impl.osgi;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import javax.management.ObjectName;
import org.opendaylight.controller.config.api.ConflictingVersionException;
+import org.opendaylight.controller.config.api.ValidationException;
import org.opendaylight.controller.config.api.jmx.CommitStatus;
import org.opendaylight.controller.config.manager.impl.ConfigRegistryImpl;
import org.opendaylight.controller.config.spi.ModuleFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.management.ObjectName;
-
/**
* Every time factory is added or removed, blank transaction is triggered to handle
* {@link org.opendaylight.controller.config.spi.ModuleFactory#getDefaultModules(org.opendaylight.controller.config.api.DependencyResolverFactory, org.osgi.framework.BundleContext)}
* functionality.
*/
public class BlankTransactionServiceTracker implements ServiceTrackerCustomizer<ModuleFactory, Object> {
- private static final Logger logger = LoggerFactory.getLogger(BlankTransactionServiceTracker.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BlankTransactionServiceTracker.class);
+
+ public static final int DEFAULT_MAX_ATTEMPTS = 10;
+
+ private final BlankTransaction blankTransaction;
+ private final ExecutorService txExecutor;
+ private final int maxAttempts;
+
+ public BlankTransactionServiceTracker(final ConfigRegistryImpl configRegistry) {
+ this(new BlankTransaction() {
+ @Override
+ public CommitStatus hit()
+ throws ValidationException, ConflictingVersionException {
+ ObjectName tx = configRegistry.beginConfig(true);
+ return configRegistry.commitConfig(tx);
+ }
+ });
+ }
- private final ConfigRegistryImpl configRegistry;
+ public BlankTransactionServiceTracker(final BlankTransaction blankTransaction) {
+ this(blankTransaction, DEFAULT_MAX_ATTEMPTS, Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
+ .setNameFormat("config-blank-txn-%d").build()));
+ }
- public BlankTransactionServiceTracker(ConfigRegistryImpl configRegistry) {
- this.configRegistry = configRegistry;
+ @VisibleForTesting
+ BlankTransactionServiceTracker(final BlankTransaction blankTx, final int maxAttempts,
+ final ExecutorService txExecutor) {
+ this.blankTransaction = blankTx;
+ this.maxAttempts = maxAttempts;
+ this.txExecutor = txExecutor;
}
@Override
public Object addingService(ServiceReference<ModuleFactory> moduleFactoryServiceReference) {
- blankTransaction();
+ blankTransactionAsync();
return null;
}
- private synchronized void blankTransaction() {
+ private void blankTransactionAsync() {
+ txExecutor.execute(() -> { blankTransactionSync(); });
+ }
+
+ void blankTransactionSync() {
// race condition check: config-persister might push new configuration while server is starting up.
ConflictingVersionException lastException = null;
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < maxAttempts; i++) {
try {
// create transaction
- ObjectName tx = configRegistry.beginConfig();
- CommitStatus commitStatus = configRegistry.commitConfig(tx);
- logger.debug("Committed blank transaction with status {}", commitStatus);
+ CommitStatus commitStatus = blankTransaction.hit();
+ LOG.debug("Committed blank transaction with status {}", commitStatus);
return;
} catch (ConflictingVersionException e) {
lastException = e;
Thread.sleep(1000);
} catch (InterruptedException interruptedException) {
Thread.currentThread().interrupt();
- throw new IllegalStateException(interruptedException);
+ LOG.debug("blankTransactionSync was interrupted");
+ return;
}
+ } catch (ValidationException e) {
+ LOG.error("Validation exception while running blank transaction indicates programming error", e);
}
}
- throw lastException;
+
+ LOG.error("Maximal number of attempts reached and still cannot get optimistic lock from config manager",
+ lastException);
}
@Override
public void modifiedService(ServiceReference <ModuleFactory> moduleFactoryServiceReference, Object o) {
- blankTransaction();
+ blankTransactionAsync();
}
@Override
public void removedService(ServiceReference<ModuleFactory> moduleFactoryServiceReference, Object o) {
- blankTransaction();
+ blankTransactionAsync();
+ }
+
+ @VisibleForTesting
+ static interface BlankTransaction {
+ CommitStatus hit() throws ValidationException, ConflictingVersionException;
}
}