Skip to content

Commit 1d31428

Browse files
pujaganipujagani
authored
[grid] Fix build due to SessionRequests renaming (#9397)
1 parent ca2c72a commit 1d31428

File tree

15 files changed

+76
-77
lines changed

15 files changed

+76
-77
lines changed

‎java/server/src/org/openqa/selenium/grid/commands/Hub.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.openqa.selenium.grid.sessionqueue.local.SessionRequests;
4545
import org.openqa.selenium.grid.sessionqueue.NewSessionQueue;
4646
import org.openqa.selenium.grid.sessionqueue.config.SessionRequestOptions;
47-
import org.openqa.selenium.grid.sessionqueue.local.LocalSessionRequests;
47+
import org.openqa.selenium.grid.sessionqueue.local.SessionRequests;
4848
import org.openqa.selenium.grid.sessionqueue.local.LocalNewSessionQueue;
4949
import org.openqa.selenium.grid.web.CombinedHandler;
5050
import org.openqa.selenium.grid.web.GridUiRoute;
@@ -144,7 +144,7 @@ protected Handlers createHandlers(Config config) {
144144
networkOptions.getHttpClientFactory(tracer));
145145

146146
SessionRequestOptions sessionRequestOptions = new SessionRequestOptions(config);
147-
SessionRequests sessionRequests = new LocalSessionRequests(
147+
SessionRequests sessionRequests = new SessionRequests(
148148
tracer,
149149
bus,
150150
sessionRequestOptions.getSessionRequestRetryInterval(),

‎java/server/src/org/openqa/selenium/grid/commands/Standalone.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.openqa.selenium.grid.sessionqueue.local.SessionRequests;
4646
import org.openqa.selenium.grid.sessionqueue.NewSessionQueue;
4747
import org.openqa.selenium.grid.sessionqueue.config.SessionRequestOptions;
48-
import org.openqa.selenium.grid.sessionqueue.local.LocalSessionRequests;
4948
import org.openqa.selenium.grid.sessionqueue.local.LocalNewSessionQueue;
5049
import org.openqa.selenium.grid.web.CombinedHandler;
5150
import org.openqa.selenium.grid.web.GridUiRoute;
@@ -141,7 +140,7 @@ protected Handlers createHandlers(Config config) {
141140
combinedHandler.addHandler(sessions);
142141

143142
SessionRequestOptions sessionRequestOptions = new SessionRequestOptions(config);
144-
SessionRequests sessionRequests = new LocalSessionRequests(
143+
SessionRequests sessionRequests = new SessionRequests(
145144
tracer,
146145
bus,
147146
sessionRequestOptions.getSessionRequestRetryInterval(),

‎java/server/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public static NewSessionQueue create(Config config) {
7070
EventBus bus = new EventBusOptions(config).getEventBus();
7171
Duration retryInterval = new SessionRequestOptions(config).getSessionRequestRetryInterval();
7272
Duration requestTimeout = new SessionRequestOptions(config).getSessionRequestTimeout();
73-
SessionRequests sessionRequests = new LocalSessionRequests(
73+
SessionRequests sessionRequests = new SessionRequests(
7474
tracer,
7575
bus,
7676
retryInterval,

‎java/server/src/org/openqa/selenium/grid/sessionqueue/local/SessionRequests.java

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,28 @@
6161

6262
@ManagedService(objectName = "org.seleniumhq.grid:type=SessionQueue,name=LocalSessionQueue",
6363
description = "New session queue")
64-
public class LocalSessionRequests extends SessionRequests {
64+
public class SessionRequests {
6565

66-
private static final Logger LOG = Logger.getLogger(LocalSessionRequests.class.getName());
66+
private static final Logger LOG = Logger.getLogger(SessionRequests.class.getName());
6767
private final EventBus bus;
68+
private final Tracer tracer;
69+
private final Duration retryInterval;
70+
private final Duration requestTimeout;
6871
private final Deque<SessionRequest> sessionRequests = new ConcurrentLinkedDeque<>();
6972
private final ReadWriteLock lock = new ReentrantReadWriteLock(true);
7073
private final ScheduledExecutorService executorService =
7174
Executors.newSingleThreadScheduledExecutor();
7275
private final Thread shutdownHook = new Thread(this::callExecutorShutdown);
73-
private final String timedOutErrorMessage = String.format(
74-
"New session request rejected after being in the queue for more than %s",
75-
format(requestTimeout));
7676

77-
public LocalSessionRequests(
77+
78+
public SessionRequests(
7879
Tracer tracer,
7980
EventBus bus,
8081
Duration retryInterval,
8182
Duration requestTimeout) {
82-
super(tracer, retryInterval, requestTimeout);
83+
this.tracer = Require.nonNull("Tracer", tracer);
84+
this.retryInterval = Require.nonNull("Session request retry interval", retryInterval);
85+
this.requestTimeout = Require.nonNull("Session request timeout", requestTimeout);
8386
this.bus = Require.nonNull("Event bus", bus);
8487
Runtime.getRuntime().addShutdownHook(shutdownHook);
8588

@@ -95,15 +98,13 @@ public static SessionRequests create(Config config) {
9598
EventBus bus = new EventBusOptions(config).getEventBus();
9699
Duration retryInterval = new SessionRequestOptions(config).getSessionRequestRetryInterval();
97100
Duration requestTimeout = new SessionRequestOptions(config).getSessionRequestTimeout();
98-
return new LocalSessionRequests(tracer, bus, retryInterval, requestTimeout);
101+
return new SessionRequests(tracer, bus, retryInterval, requestTimeout);
99102
}
100103

101-
@Override
102104
public boolean isReady() {
103105
return bus.isReady();
104106
}
105107

106-
@Override
107108
@ManagedAttribute(name = "NewSessionQueueSize")
108109
public int getQueueSize() {
109110
Lock readLock = lock.readLock();
@@ -115,7 +116,6 @@ public int getQueueSize() {
115116
}
116117
}
117118

118-
@Override
119119
public List<Set<Capabilities>> getQueuedRequests() {
120120
Lock readLock = lock.readLock();
121121
readLock.lock();
@@ -128,7 +128,6 @@ public List<Set<Capabilities>> getQueuedRequests() {
128128
}
129129
}
130130

131-
@Override
132131
public boolean offerLast(SessionRequest request) {
133132
Require.nonNull("New Session request", request);
134133

@@ -139,13 +138,13 @@ public boolean offerLast(SessionRequest request) {
139138
try {
140139
Map<String, EventAttributeValue> attributeMap = new HashMap<>();
141140
attributeMap.put(
142-
AttributeKey.LOGGER_CLASS.getKey(), EventAttribute.setValue(getClass().getName()));
141+
AttributeKey.LOGGER_CLASS.getKey(), EventAttribute.setValue(getClass().getName()));
143142

144143
boolean added = sessionRequests.offerLast(request);
145144

146145
attributeMap.put(
147-
AttributeKey.REQUEST_ID.getKey(),
148-
EventAttribute.setValue(request.getRequestId().toString()));
146+
AttributeKey.REQUEST_ID.getKey(),
147+
EventAttribute.setValue(request.getRequestId().toString()));
149148
attributeMap.put("request.added", EventAttribute.setValue(added));
150149
span.addEvent("Add new session request to the queue", attributeMap);
151150

@@ -160,7 +159,6 @@ public boolean offerLast(SessionRequest request) {
160159
}
161160
}
162161

163-
@Override
164162
public boolean offerFirst(SessionRequest request) {
165163
Require.nonNull("New Session request", request);
166164
Lock writeLock = lock.writeLock();
@@ -169,7 +167,7 @@ public boolean offerFirst(SessionRequest request) {
169167
boolean added = sessionRequests.offerFirst(request);
170168
if (added) {
171169
executorService.schedule(() -> retryRequest(request),
172-
super.retryInterval.getSeconds(), TimeUnit.SECONDS);
170+
retryInterval.getSeconds(), TimeUnit.SECONDS);
173171
}
174172
return added;
175173
} finally {
@@ -186,7 +184,7 @@ private void retryRequest(SessionRequest sessionRequest) {
186184
LOG.log(Level.INFO, "Request {0} timed out", requestId);
187185
sessionRequests.remove(sessionRequest);
188186
bus.fire(new NewSessionRejectedEvent(
189-
new NewSessionErrorResponse(requestId, timedOutErrorMessage)));
187+
new NewSessionErrorResponse(requestId, getTimeoutErrorMessage())));
190188
} else {
191189
LOG.log(Level.INFO,
192190
"Adding request back to the queue. All slots are busy. Request: {0}",
@@ -198,7 +196,6 @@ private void retryRequest(SessionRequest sessionRequest) {
198196
}
199197
}
200198

201-
@Override
202199
public Optional<SessionRequest> remove(RequestId id) {
203200
Lock writeLock = lock.writeLock();
204201
writeLock.lock();
@@ -229,7 +226,7 @@ public Optional<SessionRequest> remove(RequestId id) {
229226
if (request.isPresent()) {
230227
if (hasRequestTimedOut(request.get())) {
231228
bus.fire(new NewSessionRejectedEvent(
232-
new NewSessionErrorResponse(id, timedOutErrorMessage)));
229+
new NewSessionErrorResponse(id, getTimeoutErrorMessage())));
233230
return Optional.empty();
234231
}
235232
}
@@ -239,7 +236,6 @@ public Optional<SessionRequest> remove(RequestId id) {
239236
}
240237
}
241238

242-
@Override
243239
public int clear() {
244240
Lock writeLock = lock.writeLock();
245241
writeLock.lock();
@@ -271,7 +267,7 @@ private void purgeTimedOutRequests() {
271267
if (hasRequestTimedOut(sessionRequest)) {
272268
iterator.remove();
273269
bus.fire(new NewSessionRejectedEvent(
274-
new NewSessionErrorResponse(sessionRequest.getRequestId(), timedOutErrorMessage)));
270+
new NewSessionErrorResponse(sessionRequest.getRequestId(), getTimeoutErrorMessage())));
275271
}
276272
}
277273
} finally {
@@ -307,5 +303,10 @@ private static String format(Duration duration) {
307303
toReturn.append(secs).append("s");
308304
return toReturn.toString();
309305
}
310-
}
311306

307+
private String getTimeoutErrorMessage() {
308+
return String.format(
309+
"New session request rejected after being in the queue for more than %s",
310+
format(requestTimeout));
311+
}
312+
}

‎java/server/test/org/openqa/selenium/grid/distributor/AddingNodesTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import org.openqa.selenium.grid.node.local.LocalNode;
4747
import org.openqa.selenium.grid.security.Secret;
4848
import org.openqa.selenium.grid.sessionmap.local.LocalSessionMap;
49-
import org.openqa.selenium.grid.sessionqueue.local.LocalSessionRequests;
49+
import org.openqa.selenium.grid.sessionqueue.local.SessionRequests;
5050
import org.openqa.selenium.grid.sessionqueue.local.LocalNewSessionQueue;
5151
import org.openqa.selenium.grid.testing.TestSessionFactory;
5252
import org.openqa.selenium.grid.web.CombinedHandler;
@@ -106,7 +106,7 @@ public void setUpDistributor() throws MalformedURLException {
106106
HttpClient.Factory.createDefault());
107107

108108
LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
109-
LocalSessionRequests localNewSessionQueue = new LocalSessionRequests(
109+
SessionRequests localNewSessionQueue = new SessionRequests(
110110
tracer,
111111
bus,
112112
Duration.ofSeconds(2),

‎java/server/test/org/openqa/selenium/grid/distributor/DistributorTest.java

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.openqa.selenium.grid.sessionmap.SessionMap;
5151
import org.openqa.selenium.grid.sessionmap.local.LocalSessionMap;
5252
import org.openqa.selenium.grid.sessionqueue.SessionRequest;
53-
import org.openqa.selenium.grid.sessionqueue.local.LocalSessionRequests;
53+
import org.openqa.selenium.grid.sessionqueue.local.SessionRequests;
5454
import org.openqa.selenium.grid.sessionqueue.local.LocalNewSessionQueue;
5555
import org.openqa.selenium.grid.testing.EitherAssert;
5656
import org.openqa.selenium.grid.testing.PassthroughHttpClient;
@@ -124,7 +124,7 @@ public void setUp() throws URISyntaxException {
124124
tracer = DefaultTestTracer.createTracer();
125125
bus = new GuavaEventBus();
126126
LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
127-
LocalSessionRequests localNewSessionQueue = new LocalSessionRequests(
127+
SessionRequests localNewSessionQueue = new SessionRequests(
128128
tracer,
129129
bus,
130130
Duration.ofSeconds(2),
@@ -156,7 +156,7 @@ public void creatingANewSessionWithoutANodeEndsInFailure() {
156156
public void shouldStartHeartBeatOnNodeRegistration() {
157157
EventBus bus = new GuavaEventBus();
158158
LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
159-
LocalSessionRequests localNewSessionQueue = new LocalSessionRequests(
159+
SessionRequests localNewSessionQueue = new SessionRequests(
160160
tracer,
161161
bus,
162162
Duration.ofSeconds(2),
@@ -207,7 +207,7 @@ public void shouldStartHeartBeatOnNodeRegistration() {
207207
@Test
208208
public void shouldBeAbleToAddANodeAndCreateASession() {
209209
LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
210-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
210+
SessionRequests localSessionRequests = new SessionRequests(
211211
tracer,
212212
bus,
213213
Duration.ofSeconds(2),
@@ -248,7 +248,7 @@ public void shouldBeAbleToAddANodeAndCreateASession() {
248248
@Test
249249
public void creatingASessionAddsItToTheSessionMap() {
250250
LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
251-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
251+
SessionRequests localSessionRequests = new SessionRequests(
252252
tracer,
253253
bus,
254254
Duration.ofSeconds(2),
@@ -291,7 +291,7 @@ public void creatingASessionAddsItToTheSessionMap() {
291291
@Test
292292
public void shouldBeAbleToRemoveANode() throws MalformedURLException {
293293
LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
294-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
294+
SessionRequests localSessionRequests = new SessionRequests(
295295
tracer,
296296
bus,
297297
Duration.ofSeconds(2),
@@ -332,7 +332,7 @@ public void shouldBeAbleToRemoveANode() throws MalformedURLException {
332332
@Test
333333
public void testDrainingNodeDoesNotAcceptNewSessions() {
334334
SessionMap sessions = new LocalSessionMap(tracer, bus);
335-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
335+
SessionRequests localSessionRequests = new SessionRequests(
336336
tracer,
337337
bus,
338338
Duration.ofSeconds(2),
@@ -368,7 +368,7 @@ public void testDrainingNodeDoesNotAcceptNewSessions() {
368368
@Test
369369
public void testDrainedNodeShutsDownOnceEmpty() throws InterruptedException {
370370
SessionMap sessions = new LocalSessionMap(tracer, bus);
371-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
371+
SessionRequests localSessionRequests = new SessionRequests(
372372
tracer,
373373
bus,
374374
Duration.ofSeconds(2),
@@ -414,7 +414,7 @@ public void testDrainedNodeShutsDownOnceEmpty() throws InterruptedException {
414414
@Test
415415
public void drainedNodeDoesNotShutDownIfNotEmpty() throws InterruptedException {
416416
SessionMap sessions = new LocalSessionMap(tracer, bus);
417-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
417+
SessionRequests localSessionRequests = new SessionRequests(
418418
tracer,
419419
bus,
420420
Duration.ofSeconds(2),
@@ -460,7 +460,7 @@ public void drainedNodeDoesNotShutDownIfNotEmpty() throws InterruptedException {
460460
@Test
461461
public void drainedNodeShutsDownAfterSessionsFinish() throws InterruptedException {
462462
SessionMap sessions = new LocalSessionMap(tracer, bus);
463-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
463+
SessionRequests localSessionRequests = new SessionRequests(
464464
tracer,
465465
bus,
466466
Duration.ofSeconds(2),
@@ -535,7 +535,7 @@ public void theMostLightlyLoadedNodeIsSelectedFirst() {
535535
// * reverse insertion order
536536
// * sorted with most heavily used first
537537
SessionMap sessions = new LocalSessionMap(tracer, bus);
538-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
538+
SessionRequests localSessionRequests = new SessionRequests(
539539
tracer,
540540
bus,
541541
Duration.ofSeconds(2),
@@ -582,7 +582,7 @@ public void theMostLightlyLoadedNodeIsSelectedFirst() {
582582
@Test
583583
public void shouldUseLastSessionCreatedTimeAsTieBreaker() {
584584
SessionMap sessions = new LocalSessionMap(tracer, bus);
585-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
585+
SessionRequests localSessionRequests = new SessionRequests(
586586
tracer,
587587
bus,
588588
Duration.ofSeconds(2),
@@ -661,7 +661,7 @@ public void shouldIncludeHostsThatAreUpInHostList() {
661661
CombinedHandler handler = new CombinedHandler();
662662

663663
SessionMap sessions = new LocalSessionMap(tracer, bus);
664-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
664+
SessionRequests localSessionRequests = new SessionRequests(
665665
tracer,
666666
bus,
667667
Duration.ofSeconds(2),
@@ -717,7 +717,7 @@ public void shouldIncludeHostsThatAreUpInHostList() {
717717
@Test
718718
public void shouldNotScheduleAJobIfAllSlotsAreBeingUsed() {
719719
SessionMap sessions = new LocalSessionMap(tracer, bus);
720-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
720+
SessionRequests localSessionRequests = new SessionRequests(
721721
tracer,
722722
bus,
723723
Duration.ofSeconds(2),
@@ -757,7 +757,7 @@ public void shouldNotScheduleAJobIfAllSlotsAreBeingUsed() {
757757
@Test
758758
public void shouldReleaseSlotOnceSessionEnds() {
759759
SessionMap sessions = new LocalSessionMap(tracer, bus);
760-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
760+
SessionRequests localSessionRequests = new SessionRequests(
761761
tracer,
762762
bus,
763763
Duration.ofSeconds(2),
@@ -816,7 +816,7 @@ public void shouldNotStartASessionIfTheCapabilitiesAreNotSupported() {
816816
CombinedHandler handler = new CombinedHandler();
817817

818818
LocalSessionMap sessions = new LocalSessionMap(tracer, bus);
819-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
819+
SessionRequests localSessionRequests = new SessionRequests(
820820
tracer,
821821
bus,
822822
Duration.ofSeconds(2),
@@ -852,7 +852,7 @@ public void shouldNotStartASessionIfTheCapabilitiesAreNotSupported() {
852852
@Test
853853
public void attemptingToStartASessionWhichFailsMarksAsTheSlotAsAvailable() {
854854
SessionMap sessions = new LocalSessionMap(tracer, bus);
855-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
855+
SessionRequests localSessionRequests = new SessionRequests(
856856
tracer,
857857
bus,
858858
Duration.ofSeconds(2),
@@ -894,7 +894,7 @@ public void shouldReturnNodesThatWereDownToPoolOfNodesOnceTheyMarkTheirHealthChe
894894
SessionMap sessions = new LocalSessionMap(tracer, bus);
895895
handler.addHandler(sessions);
896896
AtomicReference<Availability> isUp = new AtomicReference<>(DOWN);
897-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
897+
SessionRequests localSessionRequests = new SessionRequests(
898898
tracer,
899899
bus,
900900
Duration.ofSeconds(2),
@@ -969,7 +969,7 @@ public void shouldPrioritizeHostsWithTheMostSlotsAvailableForASessionType() {
969969
SessionMap sessions = new LocalSessionMap(tracer, bus);
970970
handler.addHandler(sessions);
971971

972-
LocalSessionRequests localSessionRequests = new LocalSessionRequests(
972+
SessionRequests localSessionRequests = new SessionRequests(
973973
tracer,
974974
bus,
975975
Duration.ofSeconds(2),

0 commit comments

Comments
 (0)