zhongjiajie commented on code in PR #15581: URL: https://github.com/apache/dolphinscheduler/pull/15581#discussion_r1479982920
########## dolphinscheduler-storage-plugin/dolphinscheduler-storage-hdfs/src/main/java/org/apache/dolphinscheduler/plugin/storage/hdfs/LocalStorageOperator.java: ########## @@ -0,0 +1,39 @@ +/* + * 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.plugin.storage.hdfs; + +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class LocalStorageOperator extends HdfsStorageOperator { + + public LocalStorageOperator() { + super(new HdfsStorageProperties()); + } + + public LocalStorageOperator(HdfsStorageProperties hdfsStorageProperties) { + super(hdfsStorageProperties); + } + + @Override + public String getResourceFileName(String tenantCode, String fullName) { + // prefix schema `file:/` should be remove in local file mode + String fullNameRemoveSchema = fullName.replaceFirst(hdfsProperties.getDefaultFS(), ""); Review Comment: fix get related path not work in local resources mode ########## dolphinscheduler-storage-plugin/dolphinscheduler-storage-api/src/main/java/org/apache/dolphinscheduler/plugin/storage/api/StorageOperate.java: ########## @@ -72,7 +74,16 @@ public interface StorageOperate { */ default String getResourceFileName(String tenantCode, String fullName) { String resDir = getResDir(tenantCode); - return fullName.replaceFirst(resDir, ""); + String filenameReplaceResDir = fullName.replaceFirst(resDir, ""); + if (!filenameReplaceResDir.equals(fullName)) { + return filenameReplaceResDir; + } + + // Replace resource dir not effective in case of run workflow with different tenant from resource file's. + // this is backup solution to get related path, by split with RESOURCE_TYPE_FILE + return filenameReplaceResDir.contains(RESOURCE_TYPE_FILE) + ? filenameReplaceResDir.split(String.format("%s/", RESOURCE_TYPE_FILE))[1] + : filenameReplaceResDir; Review Comment: fix error when execute workflow with different tenant of resource's creator -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
