Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,16 @@ public class LocalAuthenticationMetadataProvider implements AuthenticationMetada

private LoadingCache<String, User> userCache;

protected ThreadPoolExecutor cacheRefreshExecutor;

@Override
public void initialize(AuthConfig authConfig, Supplier<?> metadataService) {
this.storage = ConfigRocksDBStorage.getStore(authConfig.getAuthConfigPath() + File.separator + "users", false);
if (!this.storage.start()) {
throw new RuntimeException("Failed to load rocksdb for auth_user, please check whether it is occupied");
}

ThreadPoolExecutor cacheRefreshExecutor = ThreadPoolMonitor.createAndMonitor(
this.cacheRefreshExecutor = ThreadPoolMonitor.createAndMonitor(
1,
1,
1000 * 60,
Expand Down Expand Up @@ -144,6 +146,9 @@ public void shutdown() {
if (this.storage != null) {
this.storage.shutdown();
}
if (this.cacheRefreshExecutor != null) {
this.cacheRefreshExecutor.shutdown();
}
}

private static class UserCacheLoader implements CacheLoader<String, User> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ public class LocalAuthorizationMetadataProvider implements AuthorizationMetadata

private LoadingCache<String, Acl> aclCache;

protected ThreadPoolExecutor cacheRefreshExecutor;

@Override
public void initialize(AuthConfig authConfig, Supplier<?> metadataService) {
this.storage = ConfigRocksDBStorage.getStore(authConfig.getAuthConfigPath() + File.separator + "acls", false);
if (!this.storage.start()) {
throw new RuntimeException("Failed to load rocksdb for auth_acl, please check whether it is occupied.");
}
ThreadPoolExecutor cacheRefreshExecutor = ThreadPoolMonitor.createAndMonitor(
this.cacheRefreshExecutor = ThreadPoolMonitor.createAndMonitor(
1,
1,
1000 * 60,
Expand Down Expand Up @@ -172,6 +174,9 @@ public void shutdown() {
if (this.storage != null) {
this.storage.shutdown();
}
if (this.cacheRefreshExecutor != null) {
this.cacheRefreshExecutor.shutdown();
}
}

private static class AclCacheLoader implements CacheLoader<String, Acl> {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.rocketmq.auth.authentication.provider;

import org.apache.rocketmq.auth.config.AuthConfig;
import org.apache.rocketmq.auth.helper.AuthTestHelper;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

public class LocalAuthenticationMetadataProviderTest {

@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();

@Test
public void testShutdownReleasesCacheExecutor() throws Exception {
AuthConfig authConfig = AuthTestHelper.createDefaultConfig();
authConfig.setAuthConfigPath(tempFolder.newFolder("auth-test").getAbsolutePath());

LocalAuthenticationMetadataProvider provider = new LocalAuthenticationMetadataProvider();
// Initialize provider to create the internal cache refresh executor
provider.initialize(authConfig, () -> null);

// After initialization, the executor should exist and not be shutdown
Assert.assertNotNull(provider.cacheRefreshExecutor);
Assert.assertFalse(provider.cacheRefreshExecutor.isShutdown());

// Shutdown provider should also shutdown its executor to release resources
provider.shutdown();

// Verify that the cache refresh executor has been shutdown
Assert.assertTrue(provider.cacheRefreshExecutor.isShutdown());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.rocketmq.auth.authorization.provider;

import org.apache.rocketmq.auth.config.AuthConfig;
import org.apache.rocketmq.auth.helper.AuthTestHelper;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

public class LocalAuthorizationMetadataProviderTest {

@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();

@Test
public void testShutdownReleasesCacheExecutor() throws Exception {
AuthConfig authConfig = AuthTestHelper.createDefaultConfig();
authConfig.setAuthConfigPath(tempFolder.newFolder("auth-test").getAbsolutePath());

LocalAuthorizationMetadataProvider provider = new LocalAuthorizationMetadataProvider();
// Initialize provider to create the internal cache refresh executor
provider.initialize(authConfig, () -> null);

// After initialization, the executor should exist and not be shutdown
Assert.assertNotNull(provider.cacheRefreshExecutor);
Assert.assertFalse(provider.cacheRefreshExecutor.isShutdown());

// Shutdown provider should also shutdown its executor to release resources
provider.shutdown();

// Verify that the cache refresh executor has been shutdown
Assert.assertTrue(provider.cacheRefreshExecutor.isShutdown());
}
}
Loading