This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new f52cd8b756 HDDS-8144.
TestDefaultCertificateClient#testTimeBeforeExpiryGracePeriod fails as we
approach DST. (#4382)
f52cd8b756 is described below
commit f52cd8b7561534f7ef7e47b13260a7bc232d52d0
Author: Istvan Fajth <[email protected]>
AuthorDate: Tue Mar 14 17:06:30 2023 +0100
HDDS-8144. TestDefaultCertificateClient#testTimeBeforeExpiryGracePeriod
fails as we approach DST. (#4382)
---
.../hdds/security/x509/certificate/client/DefaultCertificateClient.java | 2 +-
.../security/x509/certificate/client/CertificateClientTestImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
index 57087d0d24..21f769b178 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
@@ -922,7 +922,7 @@ public abstract class DefaultCertificateClient implements
CertificateClient {
Duration gracePeriod = securityConfig.getRenewalGracePeriod();
Date expireDate = certificate.getNotAfter();
LocalDateTime gracePeriodStart = expireDate.toInstant()
- .atZone(ZoneId.systemDefault()).toLocalDateTime().minus(gracePeriod);
+ .minus(gracePeriod).atZone(ZoneId.systemDefault()).toLocalDateTime();
LocalDateTime currentTime = LocalDateTime.now();
if (gracePeriodStart.isBefore(currentTime)) {
// Cert is already in grace period time.
diff --git
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/CertificateClientTestImpl.java
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/CertificateClientTestImpl.java
index 6f8abe1cbc..f3007119fe 100644
---
a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/CertificateClientTestImpl.java
+++
b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/security/x509/certificate/client/CertificateClientTestImpl.java
@@ -156,7 +156,7 @@ public class CertificateClientTestImpl implements
CertificateClient {
Duration gracePeriod = securityConfig.getRenewalGracePeriod();
Date expireDate = x509Certificate.getNotAfter();
LocalDateTime gracePeriodStart = expireDate.toInstant()
- .atZone(ZoneId.systemDefault()).toLocalDateTime().minus(gracePeriod);
+ .minus(gracePeriod).atZone(ZoneId.systemDefault()).toLocalDateTime();
LocalDateTime currentTime = LocalDateTime.now();
Duration delay = gracePeriodStart.isBefore(currentTime) ? Duration.ZERO :
Duration.between(currentTime, gracePeriodStart);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
