Skip to content

[hotfix] Fix unstable test case: testRefreshDLFAuthTokenFileAuthProvider #5186

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

Merged
JingsongLi merged 4 commits into from
Mar 3, 2025
Merged

[hotfix] Fix unstable test case: testRefreshDLFAuthTokenFileAuthProvider #5186

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b079bd
fix unstable case
jerry-024 Feb 28, 2025
457db7c
fix unstable case
jerry-024 Feb 28, 2025
c1b463f
fix
jerry-024 Mar 3, 2025
1b6f3f7
add comment
jerry-024 Mar 3, 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
3 changes: 3 additions & 0 deletions paimon-core/src/main/java/org/apache/paimon/rest/auth/DLFAuthProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public class DLFAuthProvider implements AuthProvider {
private final String tokenFilePath;

protected DLFToken token;
protected boolean refreshSuccess;
private final boolean keepRefreshed;
private Long expiresAtMillis;
private final Long tokenRefreshInMills;
Expand Down Expand Up @@ -142,10 +143,12 @@ public boolean refresh() {
long start = System.currentTimeMillis();
DLFToken newToken = readToken(tokenFilePath, 0);
if (newToken == null) {
this.refreshSuccess = false;
return false;
}
this.expiresAtMillis = start + this.tokenRefreshInMills;
this.token = newToken;
this.refreshSuccess = true;
return true;
}

Expand Down
6 changes: 4 additions & 2 deletions paimon-core/src/test/java/org/apache/paimon/rest/auth/AuthSessionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@ public void testRefreshDLFAuthTokenFileAuthProvider() throws IOException, Interr
tokenFile2Token = generateTokenAndWriteToFile(fileName);
token = tokenFile2Token.getRight();
Thread.sleep(tokenRefreshInMills * 2);
authToken = OBJECT_MAPPER_INSTANCE.writeValueAsString(dlfAuthProvider.token);
assertEquals(authToken, token);
if (dlfAuthProvider.refreshSuccess) {
Copy link
Contributor

@JingsongLi JingsongLi Mar 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe you can get token first, and get token to see if it is be equal to previous token.

authToken = OBJECT_MAPPER_INSTANCE.writeValueAsString(dlfAuthProvider.token);
assertEquals(authToken, token);
}
}

@Test
Expand Down
Loading