You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2023/12/06 08:17:39 UTC
(dolphinscheduler) branch 3.1.9-prepare updated (81a6057fd3 -> dade149f08)
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a change to branch 3.1.9-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
from 81a6057fd3 cherry-pick [Fix]Solve the deadlock problem caused by queuing #13191
new 28e74e41b9 cherry-pick [Fix-14729] fix problem with the command generated by the flink task #14902
new f7a9d6b27b [Docs] fix typo (#15032)
new dade149f08 cherry-pick [Bug-15215][Api] non-admin should not modify tenantId and queue #15254
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
docs/docs/zh/guide/resource/file-manage.md | 2 +-
.../api/service/impl/UsersServiceImpl.java | 11 +++++++++
.../api/service/UsersServiceTest.java | 17 +++++++++++++
.../plugin/task/flink/FlinkArgsUtils.java | 28 ++++++++++++----------
.../plugin/task/flink/FlinkConstants.java | 4 ++--
5 files changed, 47 insertions(+), 15 deletions(-)
(dolphinscheduler) 02/03: [Docs] fix typo (#15032)
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.9-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit f7a9d6b27b5aca1d5093e308d7ac82d0cd48a2b4
Author: Jarvis <li...@163.com>
AuthorDate: Tue Oct 17 17:15:41 2023 +0800
[Docs] fix typo (#15032)
Co-authored-by: xiangzihao <46...@qq.com>
---
docs/docs/zh/guide/resource/file-manage.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/docs/zh/guide/resource/file-manage.md b/docs/docs/zh/guide/resource/file-manage.md
index 1000cf06b1..bd9dfe86cd 100644
--- a/docs/docs/zh/guide/resource/file-manage.md
+++ b/docs/docs/zh/guide/resource/file-manage.md
@@ -4,7 +4,7 @@
> **_注意：_**
>
-> * 当您以`admin`身份等入并操作文件时，需要先给`admin`设置租户
+> * 当您以`admin`身份登入并操作文件时，需要先给`admin`设置租户
## 基础操作
(dolphinscheduler) 03/03: cherry-pick [Bug-15215][Api] non-admin should not modify tenantId and queue #15254
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.9-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit dade149f081fbcc094343fd87bae85ad65e147c7
Author: zhanqian <zh...@cai-inc.com>
AuthorDate: Mon Dec 4 10:20:34 2023 +0800
cherry-pick [Bug-15215][Api] non-admin should not modify tenantId and queue
#15254
---
.../api/service/impl/UsersServiceImpl.java | 11 +++++++++++
.../dolphinscheduler/api/service/UsersServiceTest.java | 17 +++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
index 51d7196901..b30ea1d4cd 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
@@ -395,6 +395,17 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
putMsg(result, Status.USER_NOT_EXIST, userId);
return result;
}
+
+ // non-admin should not modify tenantId and queue
+ if (!isAdmin(loginUser)) {
+ if (tenantId != null && user.getTenantId() != tenantId) {
+ throw new ServiceException(Status.USER_NO_OPERATION_PERM);
+ }
+ if (StringUtils.isNotEmpty(queue) && !StringUtils.equals(queue, user.getQueue())) {
+ throw new ServiceException(Status.USER_NO_OPERATION_PERM);
+ }
+ }
+
if (StringUtils.isNotEmpty(userName)) {
if (!CheckUtils.checkUserName(userName)) {
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
index 9ad170d7eb..1f164fb876 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/UsersServiceTest.java
@@ -814,6 +814,23 @@ public class UsersServiceTest {
return user;
}
+ /**
+ * get non-admin user
+ *
+ * @return user
+ */
+ private User getNonAdminUser() {
+
+ User user = new User();
+ user.setId(2);
+ user.setUserType(UserType.GENERAL_USER);
+ user.setUserName("userTest0001");
+ user.setUserPassword("userTest0001");
+ user.setTenantId(2);
+ user.setQueue("queue");
+ return user;
+ }
+
/**
* get tenant
*
(dolphinscheduler) 01/03: cherry-pick [Fix-14729] fix problem with the command generated by the flink task #14902
Posted by ke...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.9-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 28e74e41b9361ac6075a808bade3ee3655feeecf
Author: LiuCanWu <36...@users.noreply.github.com>
AuthorDate: Thu Sep 21 18:46:14 2023 +0800
cherry-pick [Fix-14729] fix problem with the command generated by the flink task #14902
---
.../plugin/task/flink/FlinkArgsUtils.java | 28 ++++++++++++----------
.../plugin/task/flink/FlinkConstants.java | 4 ++--
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkArgsUtils.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkArgsUtils.java
index 782b2f2f97..45590d3598 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkArgsUtils.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkArgsUtils.java
@@ -258,6 +258,8 @@ public class FlinkArgsUtils {
args.add(others);
}
+ // determine yarn queue
+ determinedYarnQueue(args, flinkParameters, deployMode, flinkVersion);
ProgramType programType = flinkParameters.getProgramType();
String mainClass = flinkParameters.getMainClass();
if (programType != null && programType != ProgramType.PYTHON && StringUtils.isNotEmpty(mainClass)) {
@@ -280,8 +282,6 @@ public class FlinkArgsUtils {
args.add(ParameterUtils.convertParameterPlaceholders(mainArgs, ParamUtils.convert(paramsMap)));
}
- // determine yarn queue
- determinedYarnQueue(args, flinkParameters, deployMode, flinkVersion);
return args;
}
@@ -291,26 +291,30 @@ public class FlinkArgsUtils {
case CLUSTER:
if (FLINK_VERSION_AFTER_OR_EQUALS_1_12.equals(flinkVersion)
|| FLINK_VERSION_AFTER_OR_EQUALS_1_13.equals(flinkVersion)) {
- doAddQueue(args, flinkParameters, FlinkConstants.FLINK_QUEUE_FOR_TARGETS);
+ doAddQueue(args, flinkParameters, FlinkConstants.FLINK_YARN_QUEUE_FOR_TARGETS);
} else {
- doAddQueue(args, flinkParameters, FlinkConstants.FLINK_QUEUE_FOR_MODE);
+ doAddQueue(args, flinkParameters, FlinkConstants.FLINK_YARN_QUEUE_FOR_MODE);
}
+ break;
case APPLICATION:
- doAddQueue(args, flinkParameters, FlinkConstants.FLINK_QUEUE_FOR_TARGETS);
+ doAddQueue(args, flinkParameters, FlinkConstants.FLINK_YARN_QUEUE_FOR_TARGETS);
+ break;
}
}
private static void doAddQueue(List<String> args, FlinkParameters flinkParameters, String option) {
String others = flinkParameters.getOthers();
if (StringUtils.isEmpty(others) || !others.contains(option)) {
- String queue = flinkParameters.getQueue();
- if (StringUtils.isNotEmpty(queue)) {
+ String yarnQueue = flinkParameters.getQueue();
+ if (StringUtils.isNotEmpty(yarnQueue)) {
switch (option) {
- case FlinkConstants.FLINK_QUEUE_FOR_TARGETS:
- args.add(String.format(FlinkConstants.FLINK_QUEUE_FOR_TARGETS + "=%s", queue));
- case FlinkConstants.FLINK_QUEUE_FOR_MODE:
- args.add(FlinkConstants.FLINK_QUEUE_FOR_MODE);
- args.add(queue);
+ case FlinkConstants.FLINK_YARN_QUEUE_FOR_TARGETS:
+ args.add(String.format(FlinkConstants.FLINK_YARN_QUEUE_FOR_TARGETS + "=%s", yarnQueue));
+ break;
+ case FlinkConstants.FLINK_YARN_QUEUE_FOR_MODE:
+ args.add(FlinkConstants.FLINK_YARN_QUEUE_FOR_MODE);
+ args.add(yarnQueue);
+ break;
}
}
}
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkConstants.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkConstants.java
index 6e8d51b2ce..b2d7607761 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkConstants.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkConstants.java
@@ -48,8 +48,8 @@ public class FlinkConstants {
public static final String FLINK_EXECUTION_TARGET = "-t";
public static final String FLINK_YARN_SLOT = "-ys";
public static final String FLINK_APP_NAME = "-ynm";
- public static final String FLINK_QUEUE_FOR_MODE = "-yqu";
- public static final String FLINK_QUEUE_FOR_TARGETS = "-Dyarn.application.queue";
+ public static final String FLINK_YARN_QUEUE_FOR_MODE = "-yqu";
+ public static final String FLINK_YARN_QUEUE_FOR_TARGETS = "-Dyarn.application.queue";
public static final String FLINK_TASK_MANAGE = "-yn";
public static final String FLINK_JOB_MANAGE_MEM = "-yjm";
public static final String FLINK_TASK_MANAGE_MEM = "-ytm";