Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor StatisticsRefreshEngine #34553

Merged
merged 2 commits into from
Feb 1, 2025
Merged

Refactor StatisticsRefreshEngine #34553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cd660d
Refactor StorageUnitManager
terrymanu Feb 1, 2025
7314dfe
Refactor StatisticsRefreshEngine
terrymanu Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...ain/java/org/apache/shardingsphere/mode/metadata/manager/resource/StorageUnitManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ public synchronized void register(final String databaseName, final Map<String, D
ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
try {
closeStaleRules(database);
buildNewMetaDataContext(databaseName, resourceSwitchManager.switchByRegisterStorageUnit(database.getResourceMetaData(), propsMap));
SwitchingResource switchingResource = resourceSwitchManager.switchByRegisterStorageUnit(database.getResourceMetaData(), propsMap);
buildNewMetaDataContext(databaseName, switchingResource);
} catch (final SQLException ex) {
log.error("Alter database: {} register storage unit failed.", databaseName, ex);
}
Expand All @@ -76,7 +77,8 @@ public synchronized void alter(final String databaseName, final Map<String, Data
ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
try {
closeStaleRules(database);
buildNewMetaDataContext(databaseName, resourceSwitchManager.switchByAlterStorageUnit(database.getResourceMetaData(), propsMap));
SwitchingResource switchingResource = resourceSwitchManager.switchByAlterStorageUnit(database.getResourceMetaData(), propsMap);
buildNewMetaDataContext(databaseName, switchingResource);
} catch (final SQLException ex) {
log.error("Alter database: {} alter storage unit failed.", databaseName, ex);
}
Expand All @@ -92,7 +94,8 @@ public synchronized void unregister(final String databaseName, final String stor
ShardingSphereDatabase database = metaDataContexts.getMetaData().getDatabase(databaseName);
try {
closeStaleRules(database);
buildNewMetaDataContext(databaseName, resourceSwitchManager.switchByUnregisterStorageUnit(database.getResourceMetaData(), Collections.singleton(storageUnitName)));
SwitchingResource switchingResource = resourceSwitchManager.switchByUnregisterStorageUnit(database.getResourceMetaData(), Collections.singleton(storageUnitName));
buildNewMetaDataContext(databaseName, switchingResource);
} catch (final SQLException ex) {
log.error("Alter database: {} register storage unit failed.", databaseName, ex);
}
Expand Down
10 changes: 3 additions & 7 deletions ...org/apache/shardingsphere/mode/metadata/refresher/statistics/StatisticsRefreshEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.shardingsphere.mode.metadata.refresher.statistics;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey;
import org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorThreadFactoryBuilder;
Expand Down Expand Up @@ -50,20 +51,14 @@
/**
* Statistics refresh engine.
*/
@RequiredArgsConstructor
@Slf4j
public final class StatisticsRefreshEngine {

private static final ExecutorService EXECUTOR_SERVICE = Executors.newSingleThreadScheduledExecutor(ExecutorThreadFactoryBuilder.build("statistics-collect-%d"));

private final ContextManager contextManager;

private final LockContext lockContext;

public StatisticsRefreshEngine(final ContextManager contextManager) {
this.contextManager = contextManager;
lockContext = contextManager.getComputeNodeInstanceContext().getLockContext();
}

/**
* Async refresh.
*/
Expand All @@ -89,6 +84,7 @@ public void refresh() {
}

private void collectAndRefresh() {
LockContext lockContext = contextManager.getComputeNodeInstanceContext().getLockContext();
GlobalLockDefinition lockDefinition = new GlobalLockDefinition(new StatisticsLock());
if (lockContext.tryLock(lockDefinition, 5000L)) {
try {
Expand Down