Browse Source

[Fix-16308] Fix query resources list paging error and docs. (#16324)

* fix issue 16308
dev
xiangzihao 4 months ago committed by GitHub
parent
commit
3dbfac3b18
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      docs/docs/en/guide/installation/cluster.md
  2. 1
      docs/docs/en/guide/installation/kubernetes.md
  3. 1
      docs/docs/en/guide/installation/pseudo-cluster.md
  4. 3
      docs/docs/en/guide/installation/standalone.md
  5. 1
      docs/docs/zh/guide/installation/cluster.md
  6. 1
      docs/docs/zh/guide/installation/kubernetes.md
  7. 1
      docs/docs/zh/guide/installation/pseudo-cluster.md
  8. 3
      docs/docs/zh/guide/installation/standalone.md
  9. 7
      dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/src/main/java/org/apache/dolphinscheduler/plugin/storage/hdfs/HdfsStorageOperator.java

1
docs/docs/en/guide/installation/cluster.md

@ -14,6 +14,7 @@ Distribute the installation package to each server of each cluster and perform a
> **_NOTICE:_** Make sure that the configuration files on each machine are consistent, otherwise the cluster will not work properly. > **_NOTICE:_** Make sure that the configuration files on each machine are consistent, otherwise the cluster will not work properly.
> **_NOTICE:_** Each service is stateless and independent of each other, so you can deploy multiple services on each machine, but you need to pay attention to port conflicts. > **_NOTICE:_** Each service is stateless and independent of each other, so you can deploy multiple services on each machine, but you need to pay attention to port conflicts.
> **_NOTICE:_** DS uses the /tmp/dolphinscheduler directory as the resource center by default. If you need to change the directory of the resource center, change the resource items in the conf/common.properties file
### Modify Configuration ### Modify Configuration

1
docs/docs/en/guide/installation/kubernetes.md

@ -520,6 +520,7 @@ helm install dolphinscheduler-gpu-worker . \
``` ```
> **Note**: the above steps are for reference only, and specific operations need to be adjusted according to the actual situation. > **Note**: the above steps are for reference only, and specific operations need to be adjusted according to the actual situation.
> **Note**: DS uses the /tmp/dolphinscheduler directory as the resource center by default. If you need to change the directory of the resource center, change the resource items in the conf/common.properties file
## Appendix-Configuration ## Appendix-Configuration

1
docs/docs/en/guide/installation/pseudo-cluster.md

@ -159,6 +159,7 @@ bash ./bin/dolphinscheduler-daemon.sh stop alert-server
> **_Note2:_**: Please refer to the section of "System Architecture Design" for service usage. Python gateway service is > **_Note2:_**: Please refer to the section of "System Architecture Design" for service usage. Python gateway service is
> started along with the api-server, and if you do not want to start Python gateway service please disabled it by changing > started along with the api-server, and if you do not want to start Python gateway service please disabled it by changing
> the yaml config `python-gateway.enabled : false` in api-server's configuration path `api-server/conf/application.yaml` > the yaml config `python-gateway.enabled : false` in api-server's configuration path `api-server/conf/application.yaml`
> **_Note3:_**: DS uses the /tmp/dolphinscheduler directory as the resource center by default. If you need to change the directory of the resource center, change the resource items in the conf/common.properties file
[jdk]: https://www.oracle.com/technetwork/java/javase/downloads/index.html [jdk]: https://www.oracle.com/technetwork/java/javase/downloads/index.html
[zookeeper]: https://zookeeper.apache.org/releases.html [zookeeper]: https://zookeeper.apache.org/releases.html

3
docs/docs/en/guide/installation/standalone.md

@ -57,3 +57,6 @@ bash ./bin/dolphinscheduler-daemon.sh status standalone-server
Standalone server use H2 database as its metadata store, it is easy and users do not need to start database before they set up server. Standalone server use H2 database as its metadata store, it is easy and users do not need to start database before they set up server.
But if user want to store metabase in other database like MySQL or PostgreSQL, they have to change some configuration. Follow the instructions in [datasource-setting](../howto/datasource-setting.md) `Standalone Switching Metadata Database Configuration` section to create and initialize database But if user want to store metabase in other database like MySQL or PostgreSQL, they have to change some configuration. Follow the instructions in [datasource-setting](../howto/datasource-setting.md) `Standalone Switching Metadata Database Configuration` section to create and initialize database
> Note: DS uses the /tmp/dolphinscheduler directory as the resource center by default. If you need to change the directory of the resource center, change the resource items in the conf/common.properties file

1
docs/docs/zh/guide/installation/cluster.md

@ -14,6 +14,7 @@
> **_注意:_** 请确保每台机器的配置文件都是一致的,否则会导致集群无法正常工作 > **_注意:_** 请确保每台机器的配置文件都是一致的,否则会导致集群无法正常工作
> **_注意:_** 每个服务都是无状态且互相独立的,所以可以在每台机器上部署多个服务,但是需要注意端口冲突问题 > **_注意:_** 每个服务都是无状态且互相独立的,所以可以在每台机器上部署多个服务,但是需要注意端口冲突问题
> **_注意_**: DS默认使用本地模式的目录 /tmp/dolphinscheduler 作为资源中心, 如果需要修改资源中心目录, 请修改配置文件 conf/common.properties 中 resource 的相关配置项
### 修改相关配置 ### 修改相关配置

1
docs/docs/zh/guide/installation/kubernetes.md

@ -519,6 +519,7 @@ helm install dolphinscheduler-gpu-worker . \
``` ```
> **注意**:以上步骤仅供参考,具体操作需要根据实际情况进行调整。 > **注意**:以上步骤仅供参考,具体操作需要根据实际情况进行调整。
> **注意**: DS默认使用本地模式的目录 /tmp/dolphinscheduler 作为资源中心, 如果需要修改资源中心目录, 请修改配置文件 conf/common.properties 中 resource 的相关配置项
## 附录-配置 ## 附录-配置

1
docs/docs/zh/guide/installation/pseudo-cluster.md

@ -166,6 +166,7 @@ bash ./bin/dolphinscheduler-daemon.sh stop alert-server
> >
> **_注意 2:_**:服务用途请具体参见《系统架构设计》小节。Python gateway service 默认与 api-server 一起启动,如果您不想启动 Python gateway service > **_注意 2:_**:服务用途请具体参见《系统架构设计》小节。Python gateway service 默认与 api-server 一起启动,如果您不想启动 Python gateway service
> 请通过更改 api-server 配置文件 `api-server/conf/application.yaml` 中的 `python-gateway.enabled : false` 来禁用它。 > 请通过更改 api-server 配置文件 `api-server/conf/application.yaml` 中的 `python-gateway.enabled : false` 来禁用它。
> **_注意 3:_**: DS默认使用本地模式的目录 /tmp/dolphinscheduler 作为资源中心, 如果需要修改资源中心目录, 请修改配置文件 conf/common.properties 中 resource 的相关配置项
[jdk]: https://www.oracle.com/technetwork/java/javase/downloads/index.html [jdk]: https://www.oracle.com/technetwork/java/javase/downloads/index.html
[zookeeper]: https://zookeeper.apache.org/releases.html [zookeeper]: https://zookeeper.apache.org/releases.html

3
docs/docs/zh/guide/installation/standalone.md

@ -51,3 +51,6 @@ bash ./bin/dolphinscheduler-daemon.sh status standalone-server
Standalone server 使用 H2 数据库作为其元数据存储数据,这是为了上手简单,用户在启动服务器之前不需要启动数据库。但是如果用户想将元数据库存储在 Standalone server 使用 H2 数据库作为其元数据存储数据,这是为了上手简单,用户在启动服务器之前不需要启动数据库。但是如果用户想将元数据库存储在
MySQL 或 PostgreSQL 等其他数据库中,必须更改一些配置。请参考 [数据源配置](../howto/datasource-setting.md) `Standalone 切换元数据库` 创建并初始化数据库 MySQL 或 PostgreSQL 等其他数据库中,必须更改一些配置。请参考 [数据源配置](../howto/datasource-setting.md) `Standalone 切换元数据库` 创建并初始化数据库
> **_注意_**: DS默认使用本地模式的目录 /tmp/dolphinscheduler 作为资源中心, 如果需要修改资源中心目录, 请修改配置文件 conf/common.properties 中 resource 的相关配置项

7
dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/src/main/java/org/apache/dolphinscheduler/plugin/storage/hdfs/HdfsStorageOperator.java

@ -224,7 +224,6 @@ public class HdfsStorageOperator extends AbstractStorageOperator implements Clos
@Override @Override
public List<StorageEntity> listFileStorageEntityRecursively(String resourceAbsolutePath) { public List<StorageEntity> listFileStorageEntityRecursively(String resourceAbsolutePath) {
exceptionIfPathEmpty(resourceAbsolutePath); exceptionIfPathEmpty(resourceAbsolutePath);
List<StorageEntity> result = new ArrayList<>(); List<StorageEntity> result = new ArrayList<>();
LinkedList<String> foldersToFetch = new LinkedList<>(); LinkedList<String> foldersToFetch = new LinkedList<>();
@ -232,7 +231,11 @@ public class HdfsStorageOperator extends AbstractStorageOperator implements Clos
while (!foldersToFetch.isEmpty()) { while (!foldersToFetch.isEmpty()) {
String absolutePath = foldersToFetch.pollFirst(); String absolutePath = foldersToFetch.pollFirst();
RemoteIterator<LocatedFileStatus> remoteIterator = fs.listFiles(new Path(absolutePath), true); Path path = new Path(absolutePath);
if (!fs.exists(path)) {
continue;
}
RemoteIterator<LocatedFileStatus> remoteIterator = fs.listFiles(path, true);
while (remoteIterator.hasNext()) { while (remoteIterator.hasNext()) {
LocatedFileStatus locatedFileStatus = remoteIterator.next(); LocatedFileStatus locatedFileStatus = remoteIterator.next();
result.add(transformFileStatusToResourceMetadata(locatedFileStatus)); result.add(transformFileStatusToResourceMetadata(locatedFileStatus));

Loading…
Cancel
Save