You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2022/08/23 12:13:05 UTC
[GitHub] [dolphinscheduler] caishunfeng commented on a diff in pull request #11614: [Improvement-#11613] Add spi priority factory
caishunfeng commented on code in PR #11614:
URL: https://github.com/apache/dolphinscheduler/pull/11614#discussion_r952534675
##########
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/async/AsyncTaskExecutionContextTest.java:
##########
@@ -0,0 +1,21 @@
+package org.apache.dolphinscheduler.plugin.task.api.async;
+
+import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
+import org.junit.Test;
+
+import java.util.Date;
+import java.util.concurrent.DelayQueue;
+import java.util.concurrent.Delayed;
+
+public class AsyncTaskExecutionContextTest {
+
+ @Test
+ public void testNoTimeout() {
Review Comment:
It seems not the same thing :eyes:
##########
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/PrioritySPIFactory.java:
##########
@@ -0,0 +1,68 @@
+/*
+ * 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.dolphinscheduler.spi.plugin;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ServiceLoader;
+
+public class PrioritySPIFactory<T extends PrioritySPI> {
+
+ private final Map<String, T> map = new HashMap<>();
+
+ public PrioritySPIFactory(Class<T> spiClass) {
+ for (T t : ServiceLoader.load(spiClass)) {
+ if (map.containsKey(t.getIdentify().getName())) {
+ resolveConflict(t);
+ } else {
+ map.put(t.getIdentify().getName(), t);
+ }
+ }
+ }
+
+ public Map<String, T> getSpiMap() {
Review Comment:
```suggestion
public Map<String, T> getSPIMap() {
```
##########
dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/plugin/PrioritySPIFactoryTest.java:
##########
@@ -0,0 +1,121 @@
+/*
+ * 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.dolphinscheduler.spi.plugin;
+
+import com.google.auto.service.AutoService;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Map;
+
+public class PrioritySPIFactoryTest {
Review Comment:
:+1:
##########
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/PrioritySPI.java:
##########
@@ -0,0 +1,58 @@
+/*
+ * 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.dolphinscheduler.spi.plugin;
+
+public interface PrioritySPI extends Comparable<Integer> {
+
+ SPIIdentify getIdentify();
+
+ /**
+ * Get the conflict strategy of the spi plugin, this will be used when there are existed two plugin has the same identify name.
+ *
+ * <p>
+ * The default strategy will use the high priority plugin.
+ */
+ default SPIConflictStrategy getConflictStrategy() {
+ return SPIConflictStrategy.LOAD_HIGH_PRIORITY;
+ }
+
+ @Override
+ default int compareTo(Integer o) {
+ return Integer.compare(getIdentify().getPriority(), o);
+ }
+
+ enum SPIConflictStrategy {
Review Comment:
Need to add doc about the SPI load rule.
##########
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/plugin/PrioritySPI.java:
##########
@@ -0,0 +1,58 @@
+/*
+ * 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.dolphinscheduler.spi.plugin;
+
+public interface PrioritySPI extends Comparable<Integer> {
+
+ SPIIdentify getIdentify();
+
+ /**
+ * Get the conflict strategy of the spi plugin, this will be used when there are existed two plugin has the same identify name.
+ *
+ * <p>
+ * The default strategy will use the high priority plugin.
+ */
+ default SPIConflictStrategy getConflictStrategy() {
+ return SPIConflictStrategy.LOAD_HIGH_PRIORITY;
+ }
+
+ @Override
+ default int compareTo(Integer o) {
+ return Integer.compare(getIdentify().getPriority(), o);
+ }
+
+ enum SPIConflictStrategy {
Review Comment:
I think we just support the `LOAD_HIGH_PRIORITY` strategy is enough, if two plugin has same priority, throw exception. Which can make a more clear load rule and make users understand earsier.
--
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.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org