Skip to content

add AuthorInfo test #5854

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

Closed
RYH61 wants to merge 21 commits into from
Closed

add AuthorInfo test #5854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
08ba304
change AuthorManager
RYH61 May 10, 2022
e0a4872
Merge branch 'apache:master' into fix_authorManager
RYH61 May 10, 2022
1ba38f3
fix bug
RYH61 May 10, 2022
ba99dc6
Merge branch 'master' of https://github.com/RYH61/iotdb into fix_auth…
RYH61 May 10, 2022
d5ccc6a
Merge branch 'master' of https://github.com/RYH61/iotdb into fix_auth…
RYH61 May 11, 2022
9b5a310
test
RYH61 May 11, 2022
88f0616
test
RYH61 May 11, 2022
de46f72
test
RYH61 May 11, 2022
85eb363
test
RYH61 May 11, 2022
2fed7c7
test
RYH61 May 11, 2022
163ae09
test
RYH61 May 11, 2022
920bb63
test
RYH61 May 11, 2022
2954976
test
RYH61 May 11, 2022
600ec36
test
RYH61 May 11, 2022
8f4cd1e
test
RYH61 May 11, 2022
85bc3e0
test
RYH61 May 11, 2022
54e921e
test
RYH61 May 11, 2022
cd7c9fb
test
RYH61 May 11, 2022
8f2a3ea
test
RYH61 May 11, 2022
0a47a1d
fix file not exist
RYH61 May 11, 2022
31c19e8
Merge branch 'master' into fix_authorManager
RYH61 May 11, 2022
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
19 changes: 7 additions & 12 deletions cluster/src/main/java/org/apache/iotdb/cluster/log/manage/MetaSingleSnapshotLogManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@
import org.apache.iotdb.cluster.log.manage.serializable.SyncLogDequeSerializer;
import org.apache.iotdb.cluster.log.snapshot.MetaSimpleSnapshot;
import org.apache.iotdb.cluster.server.member.MetaGroupMember;
import org.apache.iotdb.commons.auth.AuthException;
import org.apache.iotdb.commons.auth.authorizer.BasicAuthorizer;
import org.apache.iotdb.commons.auth.authorizer.IAuthorizer;
import org.apache.iotdb.commons.auth.entity.Role;
import org.apache.iotdb.commons.auth.entity.User;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.auth.AuthorizerManager;
import org.apache.iotdb.db.metadata.template.Template;
import org.apache.iotdb.db.metadata.template.TemplateManager;
import org.apache.iotdb.db.service.IoTDB;
Expand Down Expand Up @@ -64,16 +63,12 @@ public void takeSnapshot() throws IOException {
super.takeSnapshot();
synchronized (this) {
storageGroupTTLMap = IoTDB.schemaProcessor.getStorageGroupsTTL();
try {
IAuthorizer authorizer = BasicAuthorizer.getInstance();
userMap = authorizer.getAllUsers();
roleMap = authorizer.getAllRoles();
templateMap = TemplateManager.getInstance().getTemplateMap();
commitIndex = getCommitLogIndex();
term = getCommitLogTerm();
} catch (AuthException e) {
logger.error("get user or role info failed", e);
}
IAuthorizer authorizer = AuthorizerManager.getInstance();
userMap = authorizer.getAllUsers();
roleMap = authorizer.getAllRoles();
templateMap = TemplateManager.getInstance().getTemplateMap();
commitIndex = getCommitLogIndex();
term = getCommitLogTerm();
}
}

Expand Down
13 changes: 4 additions & 9 deletions cluster/src/main/java/org/apache/iotdb/cluster/log/snapshot/MetaSimpleSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
import org.apache.iotdb.cluster.server.member.MetaGroupMember;
import org.apache.iotdb.cluster.server.member.RaftMember;
import org.apache.iotdb.commons.auth.AuthException;
import org.apache.iotdb.commons.auth.authorizer.BasicAuthorizer;
import org.apache.iotdb.commons.auth.authorizer.IAuthorizer;
import org.apache.iotdb.commons.auth.entity.Role;
import org.apache.iotdb.commons.auth.entity.User;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.utils.SerializeUtils;
import org.apache.iotdb.db.auth.AuthorizerManager;
import org.apache.iotdb.db.engine.StorageEngine;
import org.apache.iotdb.db.exception.metadata.StorageGroupAlreadySetException;
import org.apache.iotdb.db.metadata.template.Template;
Expand Down Expand Up @@ -251,14 +251,9 @@ private void installSnapshot(MetaSimpleSnapshot snapshot) {
}

// 3. replace all users and roles
try {
IAuthorizer authorizer = BasicAuthorizer.getInstance();
installSnapshotUsers(authorizer, snapshot);
installSnapshotRoles(authorizer, snapshot);
} catch (AuthException e) {
logger.error(
"{}: Cannot get authorizer instance, error is: ", metaGroupMember.getName(), e);
}
IAuthorizer authorizer = AuthorizerManager.getInstance();
installSnapshotUsers(authorizer, snapshot);
installSnapshotRoles(authorizer, snapshot);
// 4. accept template map
TemplateManager.getInstance().setTemplateMap(snapshot.templateMap);

Expand Down
10 changes: 5 additions & 5 deletions cluster/src/test/java/org/apache/iotdb/cluster/log/snapshot/MetaSimpleSnapshotTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@
import org.apache.iotdb.cluster.server.member.MetaGroupMember;
import org.apache.iotdb.cluster.utils.CreateTemplatePlanUtil;
import org.apache.iotdb.commons.auth.AuthException;
import org.apache.iotdb.commons.auth.authorizer.BasicAuthorizer;
import org.apache.iotdb.commons.auth.entity.Role;
import org.apache.iotdb.commons.auth.entity.User;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.StartupException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.auth.AuthorizerManager;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.template.UndefinedTemplateException;
import org.apache.iotdb.db.metadata.template.Template;
Expand Down Expand Up @@ -207,13 +207,13 @@ public void testInstallSuccessfully()

for (int i = 0; i < 5; i++) {
String userName = "user_" + i;
User user = BasicAuthorizer.getInstance().getUser(userName);
User user = AuthorizerManager.getInstance().getUser(userName);
assertEquals(userMap.get(userName), user);
}

for (int i = 0; i < 10; i++) {
String roleName = "role_" + i;
Role role = BasicAuthorizer.getInstance().getRole(roleName);
Role role = AuthorizerManager.getInstance().getRole(roleName);
assertEquals(roleMap.get(roleName), role);
}

Expand Down Expand Up @@ -315,13 +315,13 @@ public void testInstallOmitted()

for (int i = 0; i < 5; i++) {
String userName = "user_" + i;
User user = BasicAuthorizer.getInstance().getUser(userName);
User user = AuthorizerManager.getInstance().getUser(userName);
assertNull(user);
}

for (int i = 0; i < 10; i++) {
String roleName = "role_" + i;
Role role = BasicAuthorizer.getInstance().getRole(roleName);
Role role = AuthorizerManager.getInstance().getRole(roleName);
assertNull(role);
}

Expand Down
Loading