From 8036b85945fcb59a5e00682bf0f648c5eac5bf02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Ko=C5=BEusznik?= <jan@kozusznik.cz>
Date: Thu, 8 Mar 2018 16:41:31 +0100
Subject: [PATCH] FIX: reason og auth fail inspection
---
.../src/main/java/cz/it4i/fiji/haas/Job.java | 1 +
.../DummyProgressNotifier.java | 4 +--
.../fiji/haas_java_client/HaaSClient.java | 2 ++
.../haas_java_client/TestHaaSJavaClient2.java | 29 +++++++++++++++++++
.../ui/TaskComputationAdapter.java | 1 +
5 files changed, 34 insertions(+), 3 deletions(-)
rename {haas-imagej-client/src/main/java/cz/it4i/fiji/haas => haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client}/DummyProgressNotifier.java (82%)
create mode 100644 haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClient2.java
diff --git a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java b/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java
index f55d820e..00c5c352 100644
--- a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java
+++ b/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/Job.java
@@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
import cz.it4i.fiji.haas.JobManager.JobManager4Job;
import cz.it4i.fiji.haas.JobManager.JobSynchronizableFile;
+import cz.it4i.fiji.haas_java_client.DummyProgressNotifier;
import cz.it4i.fiji.haas_java_client.HaaSClient;
import cz.it4i.fiji.haas_java_client.HaaSClient.UploadingFile;
import cz.it4i.fiji.haas_java_client.HaaSFileTransfer;
diff --git a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/DummyProgressNotifier.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/DummyProgressNotifier.java
similarity index 82%
rename from haas-imagej-client/src/main/java/cz/it4i/fiji/haas/DummyProgressNotifier.java
rename to haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/DummyProgressNotifier.java
index 1ada1204..927d4c04 100644
--- a/haas-imagej-client/src/main/java/cz/it4i/fiji/haas/DummyProgressNotifier.java
+++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/DummyProgressNotifier.java
@@ -1,6 +1,4 @@
-package cz.it4i.fiji.haas;
-
-import cz.it4i.fiji.haas_java_client.ProgressNotifier;
+package cz.it4i.fiji.haas_java_client;
public class DummyProgressNotifier implements ProgressNotifier {
diff --git a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java
index dac7e14f..0f3763a9 100644
--- a/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java
+++ b/haas-java-client/src/main/java/cz/it4i/fiji/haas_java_client/HaaSClient.java
@@ -246,6 +246,8 @@ public class HaaSClient {
public HaaSFileTransfer startFileTransfer(long jobId, ProgressNotifier notifier) {
try {
+ //TODO it may be usefull reuse fileTransfer for concurrent transfers
+ //- count using is needed
FileTransferMethodExt ft = getFileTransfer().getFileTransferMethod(jobId, getSessionID());
return new HaaSFileTransferImp(ft, getSessionID(), jobId, getFileTransfer(), getScpClient(ft), notifier);
} catch (RemoteException | ServiceException | UnsupportedEncodingException | JSchException e) {
diff --git a/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClient2.java b/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClient2.java
new file mode 100644
index 00000000..8667667a
--- /dev/null
+++ b/haas-java-client/src/test/java/cz/it4i/fiji/haas_java_client/TestHaaSJavaClient2.java
@@ -0,0 +1,29 @@
+package cz.it4i.fiji.haas_java_client;
+
+import java.io.IOException;
+import java.util.Arrays;
+
+import javax.xml.rpc.ServiceException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestHaaSJavaClient2 {
+
+ private static Logger log = LoggerFactory.getLogger(cz.it4i.fiji.haas_java_client.TestHaaSJavaClient2.class);
+
+ public static void main(String[] args) throws ServiceException, IOException {
+ HaaSClient client = new HaaSClient(TestingConstants.getSettings(1l, 600, 7l, "OPEN-12-20"));
+ HaaSFileTransfer tr1 = client.startFileTransfer(250, new DummyProgressNotifier());
+ HaaSFileTransfer tr2 = client.startFileTransfer(250, new DummyProgressNotifier());
+
+ log.info("config.yaml - size:" + tr1.obtainSize(Arrays.asList("config.yaml")));
+ log.info("config.yaml - size:" + tr2.obtainSize(Arrays.asList("config.yaml")));
+
+ tr1.close();
+
+ tr2.close();
+ }
+
+
+}
diff --git a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java
index de1e146f..d7127acd 100644
--- a/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java
+++ b/haas-spim-benchmark/src/main/java/cz/it4i/fiji/haas_spim_benchmark/ui/TaskComputationAdapter.java
@@ -19,6 +19,7 @@ import cz.it4i.fiji.haas_spim_benchmark.core.TaskComputation;
import cz.it4i.fiji.haas_spim_benchmark.core.TaskComputation.Log;
import javafx.beans.value.ObservableValue;
import javafx.beans.value.ObservableValueBase;
+//TASK: fix occasional auth fails with ssh
//TASK: improve performance
public class TaskComputationAdapter implements Closeable {
--
GitLab