rmetzger commented on a change in pull request #14852: URL: https://github.com/apache/flink/pull/14852#discussion_r570089870
########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/declarative/WaitingForResources.java ########## @@ -0,0 +1,162 @@ +/* + * 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.flink.runtime.scheduler.declarative; + +import org.apache.flink.api.common.JobStatus; +import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph; +import org.apache.flink.runtime.executiongraph.ExecutionGraph; +import org.apache.flink.runtime.jobmaster.slotpool.ResourceCounter; + +import org.slf4j.Logger; + +import javax.annotation.Nullable; + +import java.time.Duration; + +/** + * State which describes that the scheduler is waiting for resources in order to execute the job. + */ +class WaitingForResources implements State, ResourceConsumer { + + private final Context context; + + private final Logger logger; + + private final ResourceCounter desiredResources; + + WaitingForResources(Context context, Logger logger, ResourceCounter desiredResources) { + this.context = context; + this.logger = logger; + this.desiredResources = desiredResources; + } + + @Override + public void onEnter() { + context.runIfState(this, this::resourceTimeout, Duration.ofSeconds(10L)); + notifyNewResourcesAvailable(); + } + + @Override + public void cancel() { + context.goToFinished(context.getArchivedExecutionGraph(JobStatus.CANCELED, null)); + } + + @Override + public void suspend(Throwable cause) { + context.goToFinished(context.getArchivedExecutionGraph(JobStatus.SUSPENDED, cause)); + } + + @Override + public JobStatus getJobStatus() { + return JobStatus.INITIALIZING; + } + + @Override + public ArchivedExecutionGraph getJob() { + return context.getArchivedExecutionGraph(getJobStatus(), null); + } + + @Override + public void handleGlobalFailure(Throwable cause) { + context.goToFinished(context.getArchivedExecutionGraph(JobStatus.FAILED, cause)); Review comment: note to reviewers: I changed this from Till's original POC code. ########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/declarative/State.java ########## @@ -0,0 +1,156 @@ +/* + * 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.flink.runtime.scheduler.declarative; + +import org.apache.flink.api.common.JobStatus; +import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph; +import org.apache.flink.util.function.FunctionWithException; +import org.apache.flink.util.function.ThrowingConsumer; + +import org.slf4j.Logger; + +import java.util.Optional; + +/** + * State abstraction of the {@link DeclarativeScheduler}. This interface contains all methods every + * state implementation must support. + */ +interface State { Review comment: Good feedback, I didn't consider this. I didn't expect that much review on classes outside the test + I have never migrated a prototype to Flink, thus I need feedback like this (and I need to think harder beforehand myself ;) ) ########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/declarative/WaitingForResources.java ########## @@ -0,0 +1,162 @@ +/* + * 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.flink.runtime.scheduler.declarative; + +import org.apache.flink.api.common.JobStatus; +import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph; +import org.apache.flink.runtime.executiongraph.ExecutionGraph; +import org.apache.flink.runtime.jobmaster.slotpool.ResourceCounter; + +import org.slf4j.Logger; + +import javax.annotation.Nullable; + +import java.time.Duration; + +/** + * State which describes that the scheduler is waiting for resources in order to execute the job. + */ +class WaitingForResources implements State, ResourceConsumer { + + private final Context context; + + private final Logger logger; Review comment: Is this your personal taste, or is there consensus on the name? (I have the feeling Till prefers logger, you prefer log) From this anecdotal evidence, there seems to be no clear winner: ``` ≻ git grep "final Logger log;" | wc -l 11 ≻ git grep "final Logger logger;" | wc -l 9 ``` ########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/declarative/WaitingForResources.java ########## @@ -0,0 +1,162 @@ +/* + * 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.flink.runtime.scheduler.declarative; + +import org.apache.flink.api.common.JobStatus; +import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph; +import org.apache.flink.runtime.executiongraph.ExecutionGraph; +import org.apache.flink.runtime.jobmaster.slotpool.ResourceCounter; + +import org.slf4j.Logger; + +import javax.annotation.Nullable; + +import java.time.Duration; + +/** + * State which describes that the scheduler is waiting for resources in order to execute the job. + */ +class WaitingForResources implements State, ResourceConsumer { + + private final Context context; + + private final Logger logger; Review comment: I will change it anyways, because you are reviewing this ;) ########## File path: flink-runtime/src/test/java/org/apache/flink/runtime/scheduler/declarative/StateValidator.java ########## @@ -0,0 +1,76 @@ +/* + * 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.flink.runtime.scheduler.declarative; + +import org.apache.flink.util.Preconditions; + +import java.util.function.Consumer; + +/** + * Utility for state test classes (e.g. {@link WaitingForResourcesTest}) to track if correct input + * has been presented and if the state transition happened. + * + * @param <T> Type of the state to validate. + */ +public class StateValidator<T> { + + private Runnable trap = () -> {}; + private Consumer<T> consumer = null; + private final String stateName; + + public StateValidator(String stateName) { Review comment: Nope, it's a nice idea (in case we rename states, etc.), however, this doesn't work right now, as this PR doesn't contain all required state classes yet (Executing, Restarting, ...). I can fix this with the last State PR ;) ########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/scheduler/declarative/WaitingForResources.java ########## @@ -0,0 +1,162 @@ +/* + * 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.flink.runtime.scheduler.declarative; + +import org.apache.flink.api.common.JobStatus; +import org.apache.flink.runtime.executiongraph.ArchivedExecutionGraph; +import org.apache.flink.runtime.executiongraph.ExecutionGraph; +import org.apache.flink.runtime.jobmaster.slotpool.ResourceCounter; + +import org.slf4j.Logger; + +import javax.annotation.Nullable; + +import java.time.Duration; + +/** + * State which describes that the scheduler is waiting for resources in order to execute the job. + */ +class WaitingForResources implements State, ResourceConsumer { + + private final Context context; + + private final Logger logger; Review comment: Let the grep-games begin ;) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
