forked from apache/pulsar
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Initialize TLS context only when attempting connection (apache#4399)
* Initialize TLS context only when attempting connection * Fixed eviction time check
- Loading branch information
Showing
4 changed files
with
195 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
pulsar-client/src/main/java/org/apache/pulsar/client/util/ObjectCache.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/** | ||
* 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.pulsar.client.util; | ||
|
||
import java.util.function.Supplier; | ||
import java.time.Clock; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
public class ObjectCache<T> implements Supplier<T> { | ||
|
||
private final Supplier<T> supplier; | ||
private T cachedInstance; | ||
|
||
private final long cacheDurationMillis; | ||
private long lastRefreshTimestamp; | ||
private final Clock clock; | ||
|
||
public ObjectCache(Supplier<T> supplier, long cacheDuration, TimeUnit unit) { | ||
this(supplier, cacheDuration, unit, Clock.systemUTC()); | ||
} | ||
|
||
ObjectCache(Supplier<T> supplier, long cacheDuration, TimeUnit unit, Clock clock) { | ||
this.supplier = supplier; | ||
this.cachedInstance = null; | ||
this.cacheDurationMillis = unit.toMillis(cacheDuration); | ||
this.clock = clock; | ||
} | ||
|
||
public synchronized T get() { | ||
long now = clock.millis(); | ||
if (cachedInstance == null || (now - lastRefreshTimestamp) >= cacheDurationMillis) { | ||
cachedInstance = supplier.get(); | ||
lastRefreshTimestamp = now; | ||
} | ||
|
||
return cachedInstance; | ||
} | ||
} |
45 changes: 45 additions & 0 deletions
45
pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientInitializationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/** | ||
* 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.pulsar.client.impl; | ||
|
||
import static org.mockito.Mockito.mock; | ||
import static org.mockito.Mockito.*; | ||
|
||
import org.apache.pulsar.client.api.Authentication; | ||
import org.apache.pulsar.client.api.PulsarClient; | ||
import org.apache.pulsar.client.api.PulsarClientException; | ||
import org.testng.annotations.Test; | ||
|
||
public class ClientInitializationTest { | ||
|
||
@Test | ||
public void testInitializeAuthWithTls() throws PulsarClientException { | ||
Authentication auth = mock(Authentication.class); | ||
|
||
PulsarClient.builder() | ||
.serviceUrl("pulsar+ssl://my-host:6650") | ||
.authentication(auth) | ||
.build(); | ||
|
||
// Auth should only be started, though we shouldn't have tried to get credentials yet (until we first attempt to | ||
// connect). | ||
verify(auth).start(); | ||
verifyNoMoreInteractions(auth); | ||
} | ||
} |
64 changes: 64 additions & 0 deletions
64
pulsar-client/src/test/java/org/apache/pulsar/client/util/ObjectCacheTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/** | ||
* 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.pulsar.client.util; | ||
|
||
import static org.mockito.Mockito.mock; | ||
import static org.mockito.Mockito.when; | ||
import static org.testng.Assert.assertEquals; | ||
|
||
import java.time.Clock; | ||
import java.util.concurrent.TimeUnit; | ||
import java.util.concurrent.atomic.AtomicInteger; | ||
import java.util.concurrent.atomic.AtomicLong; | ||
import java.util.function.Supplier; | ||
|
||
import org.testng.annotations.Test; | ||
|
||
public class ObjectCacheTest { | ||
@Test | ||
public void testCache() { | ||
|
||
AtomicLong currentTime = new AtomicLong(0); | ||
|
||
Clock clock = mock(Clock.class); | ||
when(clock.millis()).then(invocation -> currentTime); | ||
|
||
AtomicInteger currentValue = new AtomicInteger(0); | ||
|
||
Supplier<Integer> cache = new ObjectCache<>(() -> currentValue.getAndIncrement(), | ||
10, TimeUnit.MILLISECONDS, clock); | ||
|
||
assertEquals(cache.get().intValue(), 0); | ||
assertEquals(cache.get().intValue(), 0); | ||
|
||
currentTime.set(1); | ||
// Still the value has not expired | ||
assertEquals(cache.get().intValue(), 0); | ||
|
||
currentTime.set(10); | ||
assertEquals(cache.get().intValue(), 1); | ||
|
||
|
||
currentTime.set(15); | ||
assertEquals(cache.get().intValue(), 1); | ||
|
||
currentTime.set(22); | ||
assertEquals(cache.get().intValue(), 2); | ||
} | ||
} |