#278

Committed 08 Jul 2024 04:42PM UTC coverage: 77.565% (+0.1%) from 77.469%

Build # #278

Build Type

push

github

Committed by

web-flow

Commit Message

Revert configurable slot provider (#2134)

* Revert "Resource based tuner (#2110)"

This reverts commit 8a2d5cdcc.

* Revert "Slot supplier interface & fixed-size implementation (#2014)"

This reverts commit d2a06fc6f.

* Fix merge conflict

* Keep Publish Test Report step

* Add tests for worker slots

* Fix white space

* One other whitespace change

Run Details

117 of 133 new or added lines in 17 files covered. (87.97%)

5 existing lines in 5 files now uncovered.

19088 of 24609 relevant lines covered (77.57%)

0.78 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

88.24

/temporal-sdk/src/main/java/io/temporal/internal/worker/EagerActivitySlotsReservation.java

/*
 * Copyright (C) 2022 Temporal Technologies, Inc. All Rights Reserved.
 *
 * Copyright (C) 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 *
 * Modifications copyright (C) 2017 Uber Technologies, Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this material 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 io.temporal.internal.worker;

import com.google.common.base.Preconditions;
import io.temporal.api.command.v1.Command;
import io.temporal.api.command.v1.ScheduleActivityTaskCommandAttributes;
import io.temporal.api.enums.v1.CommandType;
import io.temporal.api.workflowservice.v1.PollActivityTaskQueueResponse;
import io.temporal.api.workflowservice.v1.RespondWorkflowTaskCompletedRequest;
import io.temporal.api.workflowservice.v1.RespondWorkflowTaskCompletedResponse;
import io.temporal.internal.Config;
import java.io.Closeable;
import javax.annotation.concurrent.NotThreadSafe;

/** This class is not thread safe and shouldn't leave the boundaries of one activity executor */
@NotThreadSafe
class EagerActivitySlotsReservation implements Closeable {
  private final EagerActivityDispatcher eagerActivityDispatcher;
  private int outstandingReservationSlotsCount = 0;

  EagerActivitySlotsReservation(EagerActivityDispatcher eagerActivityDispatcher) {
    this.eagerActivityDispatcher = eagerActivityDispatcher;
  }

  public void applyToRequest(RespondWorkflowTaskCompletedRequest.Builder mutableRequest) {
    for (int i = 0; i < mutableRequest.getCommandsCount(); i++) {
      Command command = mutableRequest.getCommands(i);
      if (command.getCommandType() != CommandType.COMMAND_TYPE_SCHEDULE_ACTIVITY_TASK) continue;

      ScheduleActivityTaskCommandAttributes commandAttributes =
          command.getScheduleActivityTaskCommandAttributes();
      if (!commandAttributes.getRequestEagerExecution()) continue;

      if (this.outstandingReservationSlotsCount < Config.EAGER_ACTIVITIES_LIMIT
          && this.eagerActivityDispatcher.tryReserveActivitySlot(commandAttributes)) {
        this.outstandingReservationSlotsCount++;
      } else {
        mutableRequest.setCommands(
            i,
            command.toBuilder()
                .setScheduleActivityTaskCommandAttributes(
                    commandAttributes.toBuilder().setRequestEagerExecution(false)));
      }
    }
  }

  public void handleResponse(RespondWorkflowTaskCompletedResponse serverResponse) {
    int activityTasksCount = serverResponse.getActivityTasksCount();
    Preconditions.checkArgument(
        activityTasksCount <= this.outstandingReservationSlotsCount,
        "Unexpectedly received %s eager activities though we only requested %s",
        activityTasksCount,
        this.outstandingReservationSlotsCount);

    releaseSlots(this.outstandingReservationSlotsCount - activityTasksCount);

    for (PollActivityTaskQueueResponse act : serverResponse.getActivityTasksList()) {
      // don't release slots here, instead the semaphore release reference is passed to the activity
      // worker to release when the activity is done
      this.eagerActivityDispatcher.dispatchActivity(act);
    }

    this.outstandingReservationSlotsCount = 0;
  }

  @Override
  public void close() {
    if (this.outstandingReservationSlotsCount > 0)
      releaseSlots(this.outstandingReservationSlotsCount);
  }

  private void releaseSlots(int slotsToRelease) {
    if (slotsToRelease > this.outstandingReservationSlotsCount)
      throw new IllegalStateException(
          "Trying to release more activity slots than outstanding reservations");

    this.eagerActivityDispatcher.releaseActivitySlotReservations(slotsToRelease);
    this.outstandingReservationSlotsCount -= slotsToRelease;
  }
}

1	/*
2	* Copyright (C) 2022 Temporal Technologies, Inc. All Rights Reserved.
3	*
4	* Copyright (C) 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
5	*
6	* Modifications copyright (C) 2017 Uber Technologies, Inc.
7	*
8	* Licensed under the Apache License, Version 2.0 (the "License");
9	* you may not use this material except in compliance with the License.
10	* You may obtain a copy of the License at
11	*
12	* http://www.apache.org/licenses/LICENSE-2.0
13	*
14	* Unless required by applicable law or agreed to in writing, software
15	* distributed under the License is distributed on an "AS IS" BASIS,
16	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17	* See the License for the specific language governing permissions and
18	* limitations under the License.
19	*/
20
21	package io.temporal.internal.worker;
22
23	import com.google.common.base.Preconditions;
24	import io.temporal.api.command.v1.Command;
25	import io.temporal.api.command.v1.ScheduleActivityTaskCommandAttributes;
26	import io.temporal.api.enums.v1.CommandType;
27	import io.temporal.api.workflowservice.v1.PollActivityTaskQueueResponse;
28	import io.temporal.api.workflowservice.v1.RespondWorkflowTaskCompletedRequest;
29	import io.temporal.api.workflowservice.v1.RespondWorkflowTaskCompletedResponse;
30	import io.temporal.internal.Config;
31	import java.io.Closeable;
32	import javax.annotation.concurrent.NotThreadSafe;
33
34	/** This class is not thread safe and shouldn't leave the boundaries of one activity executor */
35	@NotThreadSafe
36	class EagerActivitySlotsReservation implements Closeable {
37	private final EagerActivityDispatcher eagerActivityDispatcher;
38	private int outstandingReservationSlotsCount = 0;	1✔
39
40	EagerActivitySlotsReservation(EagerActivityDispatcher eagerActivityDispatcher) {	1✔
41	this.eagerActivityDispatcher = eagerActivityDispatcher;	1✔
42	}	1✔
43
44	public void applyToRequest(RespondWorkflowTaskCompletedRequest.Builder mutableRequest) {
45	for (int i = 0; i < mutableRequest.getCommandsCount(); i++) {	1✔
46	Command command = mutableRequest.getCommands(i);	1✔
47	if (command.getCommandType() != CommandType.COMMAND_TYPE_SCHEDULE_ACTIVITY_TASK) continue;	1✔
48
49	ScheduleActivityTaskCommandAttributes commandAttributes =	1✔
50	command.getScheduleActivityTaskCommandAttributes();	1✔
51	if (!commandAttributes.getRequestEagerExecution()) continue;	1✔
52
53	if (this.outstandingReservationSlotsCount < Config.EAGER_ACTIVITIES_LIMIT	1✔
54	&& this.eagerActivityDispatcher.tryReserveActivitySlot(commandAttributes)) {	1✔
55	this.outstandingReservationSlotsCount++;	1✔
56	} else {
57	mutableRequest.setCommands(	1✔
58	i,
59	command.toBuilder()	1✔
60	.setScheduleActivityTaskCommandAttributes(	1✔
61	commandAttributes.toBuilder().setRequestEagerExecution(false)));	1✔
62	}
63	}
64	}	1✔
65
66	public void handleResponse(RespondWorkflowTaskCompletedResponse serverResponse) {
67	int activityTasksCount = serverResponse.getActivityTasksCount();	1✔
68	Preconditions.checkArgument(	1✔
69	activityTasksCount <= this.outstandingReservationSlotsCount,
70	"Unexpectedly received %s eager activities though we only requested %s",
71	activityTasksCount,
72	this.outstandingReservationSlotsCount);
73
74	releaseSlots(this.outstandingReservationSlotsCount - activityTasksCount);	1✔
75
76	for (PollActivityTaskQueueResponse act : serverResponse.getActivityTasksList()) {	1✔
77	// don't release slots here, instead the semaphore release reference is passed to the activity
78	// worker to release when the activity is done
NEW 79	this.eagerActivityDispatcher.dispatchActivity(act);	×
UNCOV 80	}	×
81
82	this.outstandingReservationSlotsCount = 0;	1✔
83	}	1✔
84
85	@Override
86	public void close() {
87	if (this.outstandingReservationSlotsCount > 0)	1✔
NEW 88	releaseSlots(this.outstandingReservationSlotsCount);	×
89	}	1✔
90
91	private void releaseSlots(int slotsToRelease) {
92	if (slotsToRelease > this.outstandingReservationSlotsCount)	1✔
NEW 93	throw new IllegalStateException(	×
94	"Trying to release more activity slots than outstanding reservations");
95
96	this.eagerActivityDispatcher.releaseActivitySlotReservations(slotsToRelease);	1✔
97	this.outstandingReservationSlotsCount -= slotsToRelease;	1✔
98	}	1✔
99	}

temporalio / sdk-java / #278

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous