Browse Source
* The resource download method is selected according to the configuration and the service startup verification is added. * common check CI fix * Startup check changed to running check * code smell * Coordinate resources to increase test coverage. * Split resource download method. * Unit Test Coverage Co-authored-by: WangJPLeo <wangjipeng@whaleops.com>3.0.0/version-upgrade
WangJPLeo
3 years ago
committed by
GitHub
13 changed files with 255 additions and 156 deletions
@ -0,0 +1,43 @@ |
|||||||
|
/* |
||||||
|
* 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.common.exception; |
||||||
|
|
||||||
|
/** |
||||||
|
* exception for store |
||||||
|
*/ |
||||||
|
public class StorageOperateNoConfiguredException extends RuntimeException { |
||||||
|
|
||||||
|
public StorageOperateNoConfiguredException() { |
||||||
|
} |
||||||
|
|
||||||
|
public StorageOperateNoConfiguredException(String message) { |
||||||
|
super(message); |
||||||
|
} |
||||||
|
|
||||||
|
public StorageOperateNoConfiguredException(String message, Throwable cause) { |
||||||
|
super(message, cause); |
||||||
|
} |
||||||
|
|
||||||
|
public StorageOperateNoConfiguredException(Throwable cause) { |
||||||
|
super(cause); |
||||||
|
} |
||||||
|
|
||||||
|
public StorageOperateNoConfiguredException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) { |
||||||
|
super(message, cause, enableSuppression, writableStackTrace); |
||||||
|
} |
||||||
|
} |
@ -1,48 +0,0 @@ |
|||||||
/* |
|
||||||
* 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.common.storage; |
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.common.enums.ResUploadType; |
|
||||||
|
|
||||||
import java.util.EnumMap; |
|
||||||
import java.util.Objects; |
|
||||||
import java.util.ServiceLoader; |
|
||||||
/** |
|
||||||
* @author Storage Operate Manager |
|
||||||
*/ |
|
||||||
public class StorageOperateManager { |
|
||||||
|
|
||||||
public static final EnumMap<ResUploadType, StorageOperate> OPERATE_MAP = new EnumMap<>(ResUploadType.class); |
|
||||||
|
|
||||||
static { |
|
||||||
ServiceLoader<StorageOperate> load = ServiceLoader.load(StorageOperate.class); |
|
||||||
for (StorageOperate storageOperate : load) { |
|
||||||
OPERATE_MAP.put(storageOperate.returnStorageType(), storageOperate); |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
public static StorageOperate getStorageOperate(ResUploadType resUploadType) { |
|
||||||
if (Objects.isNull(resUploadType)){ |
|
||||||
resUploadType = ResUploadType.HDFS; |
|
||||||
} |
|
||||||
StorageOperate storageOperate = OPERATE_MAP.get(resUploadType); |
|
||||||
if (Objects.isNull(storageOperate)){ |
|
||||||
storageOperate = OPERATE_MAP.get(ResUploadType.HDFS); |
|
||||||
} |
|
||||||
return storageOperate; |
|
||||||
} |
|
||||||
} |
|
@ -0,0 +1,43 @@ |
|||||||
|
/* |
||||||
|
* 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.common.exception; |
||||||
|
|
||||||
|
|
||||||
|
import org.junit.Assert; |
||||||
|
import org.junit.Test; |
||||||
|
|
||||||
|
public class ExceptionTest { |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testException(){ |
||||||
|
final String message = "Test"; |
||||||
|
RuntimeException time = new RuntimeException(message); |
||||||
|
|
||||||
|
Assert.assertNull(new BaseException().getMessage()); |
||||||
|
Assert.assertNotNull(new BaseException(message).getMessage()); |
||||||
|
Assert.assertNotNull(new BaseException(message, time).getMessage()); |
||||||
|
Assert.assertNotNull(new BaseException(time).getCause()); |
||||||
|
Assert.assertNotNull(new BaseException(message, time, false, false).getMessage()); |
||||||
|
|
||||||
|
Assert.assertNull(new StorageOperateNoConfiguredException().getMessage()); |
||||||
|
Assert.assertNotNull(new StorageOperateNoConfiguredException(message).getMessage()); |
||||||
|
Assert.assertNotNull(new StorageOperateNoConfiguredException(message, time).getMessage()); |
||||||
|
Assert.assertNotNull(new StorageOperateNoConfiguredException(time).getCause()); |
||||||
|
Assert.assertNotNull(new StorageOperateNoConfiguredException(message, time, false, false).getMessage()); |
||||||
|
} |
||||||
|
} |
@ -1,50 +0,0 @@ |
|||||||
/* |
|
||||||
* 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.common.storage; |
|
||||||
|
|
||||||
import org.apache.dolphinscheduler.common.enums.ResUploadType; |
|
||||||
import org.apache.dolphinscheduler.common.utils.HadoopUtils; |
|
||||||
import org.junit.Assert; |
|
||||||
import org.junit.Test; |
|
||||||
import org.junit.runner.RunWith; |
|
||||||
import org.mockito.Mock; |
|
||||||
import org.mockito.Mockito; |
|
||||||
import org.mockito.junit.MockitoJUnitRunner; |
|
||||||
|
|
||||||
import java.util.EnumMap; |
|
||||||
|
|
||||||
/** |
|
||||||
* @author StorageOperateManagerTest |
|
||||||
*/ |
|
||||||
@RunWith(MockitoJUnitRunner.class) |
|
||||||
public class StorageOperateManagerTest { |
|
||||||
|
|
||||||
@Mock |
|
||||||
private HadoopUtils hadoopUtils; |
|
||||||
|
|
||||||
@Test |
|
||||||
public void testManager() { |
|
||||||
StorageOperateManager mock = Mockito.mock(StorageOperateManager.class); |
|
||||||
Assert.assertNotNull(mock); |
|
||||||
|
|
||||||
EnumMap<ResUploadType, StorageOperate> storageOperateMap = StorageOperateManager.OPERATE_MAP; |
|
||||||
storageOperateMap.put(ResUploadType.HDFS, hadoopUtils); |
|
||||||
|
|
||||||
StorageOperate storageOperate = StorageOperateManager.getStorageOperate(ResUploadType.HDFS); |
|
||||||
Assert.assertNotNull(storageOperate); |
|
||||||
} |
|
||||||
} |
|
@ -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.dolphinscheduler.server.worker.runner; |
||||||
|
|
||||||
|
import org.apache.commons.lang3.tuple.Pair; |
||||||
|
import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; |
||||||
|
import org.apache.dolphinscheduler.server.worker.processor.TaskCallbackService; |
||||||
|
import org.apache.dolphinscheduler.server.worker.registry.WorkerRegistryClientTest; |
||||||
|
import org.apache.dolphinscheduler.service.alert.AlertClientService; |
||||||
|
import org.apache.dolphinscheduler.service.task.TaskPluginManager; |
||||||
|
import org.junit.Assert; |
||||||
|
import org.junit.Test; |
||||||
|
import org.junit.runner.RunWith; |
||||||
|
import org.mockito.Mock; |
||||||
|
import org.powermock.modules.junit4.PowerMockRunner; |
||||||
|
import org.slf4j.Logger; |
||||||
|
import org.slf4j.LoggerFactory; |
||||||
|
|
||||||
|
import java.util.ArrayList; |
||||||
|
import java.util.HashMap; |
||||||
|
import java.util.List; |
||||||
|
import java.util.Map; |
||||||
|
|
||||||
|
@RunWith(PowerMockRunner.class) |
||||||
|
public class TaskExecuteThreadTest { |
||||||
|
|
||||||
|
private static final Logger LOGGER = LoggerFactory.getLogger(WorkerRegistryClientTest.class); |
||||||
|
|
||||||
|
@Mock |
||||||
|
private TaskExecutionContext taskExecutionContext; |
||||||
|
|
||||||
|
@Mock |
||||||
|
private TaskCallbackService taskCallbackService; |
||||||
|
|
||||||
|
@Mock |
||||||
|
private AlertClientService alertClientService; |
||||||
|
|
||||||
|
@Mock |
||||||
|
private TaskPluginManager taskPluginManager; |
||||||
|
|
||||||
|
@Test |
||||||
|
public void checkTest(){ |
||||||
|
TaskExecuteThread taskExecuteThread = new TaskExecuteThread(taskExecutionContext, taskCallbackService, alertClientService, taskPluginManager); |
||||||
|
|
||||||
|
String path = "/"; |
||||||
|
Map<String, String> projectRes = new HashMap<>(); |
||||||
|
projectRes.put("shell", "shell.sh"); |
||||||
|
List<Pair<String, String>> downloads = new ArrayList<>(); |
||||||
|
try{ |
||||||
|
downloads = taskExecuteThread.downloadCheck(path, projectRes); |
||||||
|
}catch (Exception e){ |
||||||
|
Assert.assertNotNull(e); |
||||||
|
} |
||||||
|
downloads.add(Pair.of("shell", "shell.sh")); |
||||||
|
try{ |
||||||
|
taskExecuteThread.downloadResource(path, LOGGER, downloads); |
||||||
|
}catch (Exception e){ |
||||||
|
|
||||||
|
} |
||||||
|
} |
||||||
|
} |
Loading…
Reference in new issue