Skip to content

KYLIN-5538 fix thread leak #2118

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

Open
liuzhao-lz wants to merge 1 commit into
base: kylin4
Choose a base branch
from
Open

KYLIN-5538 fix thread leak #2118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion core-cube/src/main/java/org/apache/kylin/cube/CubeDescManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import org.apache.commons.lang3.StringUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.JDBCResourceStore;
import org.apache.kylin.common.persistence.JsonSerializer;
import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.common.persistence.Serializer;
Expand Down Expand Up @@ -110,7 +111,10 @@ protected CubeDesc initEntityAfterReload(CubeDesc cubeDesc, String resourceName)

// touch lower level metadata before registering my listener
crud.reloadAll();
Broadcaster.getInstance(config).registerListener(new CubeDescSyncListener(), "cube_desc");

if (JDBCResourceStore.JDBC_SCHEME.equals(config.getMetadataUrl().getScheme())) {
Broadcaster.getInstance(config).registerListener(new CubeDescSyncListener(), "cube_desc");
}
}

private class CubeDescSyncListener extends Broadcaster.Listener {
Expand Down
6 changes: 5 additions & 1 deletion core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

import org.apache.commons.lang3.StringUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.JDBCResourceStore;
import org.apache.kylin.common.persistence.JsonSerializer;
import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.common.persistence.Serializer;
Expand Down Expand Up @@ -138,7 +139,10 @@ protected CubeInstance initEntityAfterReload(CubeInstance cube, String resourceN

// touch lower level metadata before registering my listener
crud.reloadAll();
Broadcaster.getInstance(config).registerListener(new CubeSyncListener(), "cube");

if (JDBCResourceStore.JDBC_SCHEME.equals(config.getMetadataUrl().getScheme())) {
Broadcaster.getInstance(config).registerListener(new CubeSyncListener(), "cube");
}
}

private class CubeSyncListener extends Broadcaster.Listener {
Expand Down
16 changes: 13 additions & 3 deletions core-metadata/src/main/java/org/apache/kylin/metadata/TableMetadataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.Set;

import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.JDBCResourceStore;
import org.apache.kylin.common.persistence.JsonSerializer;
import org.apache.kylin.common.persistence.RawResource;
import org.apache.kylin.common.persistence.ResourceStore;
Expand Down Expand Up @@ -124,7 +125,10 @@ protected TableDesc initEntityAfterReload(TableDesc t, String resourceName) {
}
};
srcTableCrud.reloadAll();
Broadcaster.getInstance(config).registerListener(new SrcTableSyncListener(), "table");

if (JDBCResourceStore.JDBC_SCHEME.equals(config.getMetadataUrl().getScheme())) {
Broadcaster.getInstance(config).registerListener(new SrcTableSyncListener(), "table");
}
}

private class SrcTableSyncListener extends Broadcaster.Listener {
Expand Down Expand Up @@ -305,7 +309,10 @@ protected TableExtDesc initEntityAfterReload(TableExtDesc t, String resourceName
}
};
srcExtCrud.reloadAll();
Broadcaster.getInstance(config).registerListener(new SrcTableExtSyncListener(), "table_ext");

if (JDBCResourceStore.JDBC_SCHEME.equals(config.getMetadataUrl().getScheme())) {
Broadcaster.getInstance(config).registerListener(new SrcTableExtSyncListener(), "table_ext");
}
}

private class SrcTableExtSyncListener extends Broadcaster.Listener {
Expand Down Expand Up @@ -449,7 +456,10 @@ protected ExternalFilterDesc initEntityAfterReload(ExternalFilterDesc t, String
}
};
extFilterCrud.reloadAll();
Broadcaster.getInstance(config).registerListener(new ExtFilterSyncListener(), "external_filter");

if (JDBCResourceStore.JDBC_SCHEME.equals(config.getMetadataUrl().getScheme())) {
Broadcaster.getInstance(config).registerListener(new ExtFilterSyncListener(), "external_filter");
}
}

private class ExtFilterSyncListener extends Broadcaster.Listener {
Expand Down
6 changes: 5 additions & 1 deletion core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Map;

import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.JDBCResourceStore;
import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.common.persistence.Serializer;
import org.apache.kylin.common.persistence.WriteConflictException;
Expand Down Expand Up @@ -106,7 +107,10 @@ protected DataModelDesc initEntityAfterReload(DataModelDesc model, String resour
// touch lower level metadata before registering model listener
TableMetadataManager.getInstance(config);
crud.reloadAll();
Broadcaster.getInstance(config).registerListener(new DataModelSyncListener(), "data_model");

if (JDBCResourceStore.JDBC_SCHEME.equals(config.getMetadataUrl().getScheme())) {
Broadcaster.getInstance(config).registerListener(new DataModelSyncListener(), "data_model");
}
}

private class DataModelSyncListener extends Broadcaster.Listener {
Expand Down
6 changes: 5 additions & 1 deletion core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

import org.apache.commons.lang3.StringUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.persistence.JDBCResourceStore;
import org.apache.kylin.common.persistence.ResourceStore;
import org.apache.kylin.common.util.AutoReadWriteLock;
import org.apache.kylin.common.util.AutoReadWriteLock.AutoLock;
Expand Down Expand Up @@ -93,7 +94,10 @@ protected ProjectInstance initEntityAfterReload(ProjectInstance prj, String reso

// touch lower level metadata before registering my listener
crud.reloadAll();
Broadcaster.getInstance(config).registerListener(new ProjectSyncListener(), "project");

if (JDBCResourceStore.JDBC_SCHEME.equals(config.getMetadataUrl().getScheme())) {
Broadcaster.getInstance(config).registerListener(new ProjectSyncListener(), "project");
}
}

private class ProjectSyncListener extends Broadcaster.Listener {
Expand Down