-
-
Couldn't load subscription status.
- Fork 320
Update support for iRODS #17341
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Update support for iRODS #17341
Conversation
irods/bin/src/test/resources/iRODS (iPlant Collaborative).cyberduckprofile
Outdated
Show resolved
Hide resolved
| // TODO If we're dealing with a collection, should existing data objects sharing | ||
| // the same name be overwritten? This should probably be a configurable option. | ||
| IRODSFilesystem.copy(conn.getRcComm(), from, to, IRODSFilesystem.CopyOptions.RECURSIVE); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Handle TODO
irods/src/main/java/ch/cyberduck/core/irods/IRODSDeleteFeature.java
Outdated
Show resolved
Hide resolved
irods/src/main/java/ch/cyberduck/core/irods/IRODSUploadFeature.java
Outdated
Show resolved
Hide resolved
irods/src/main/java/ch/cyberduck/core/irods/IRODSUploadFeature.java
Outdated
Show resolved
Hide resolved
irods/src/test/java/ch/cyberduck/core/irods/IRODSExceptionMappingServiceTest.java
Outdated
Show resolved
Hide resolved
|
|
|
@dkocher Can you provide the Entity CLA? |
Discussed in #14449 (comment) |
|
TODO: Update documentation for iRODS - https://docs.cyberduck.io/protocols/irods/ |
|
updating the docs is a separate repo, would have its own PR |
|
TODO: Release new version of irods4j for checksum fixes. |
660266c to
f914720
Compare
|
Rebased PR on top of master. Verified the following:
With this PR, users will not be able to calculate checksums on data in an iRODS zone. Cyberduck will report checksums in their hex form if they exist in iRODS. We could add an option to the iRODS profile which allows users to instruct Cyberduck to calculate checksums following an upload, but that didn't feel like the correct approach, mainly because profiles seem to be loaded once on program start and never reread. As for the unit/integration tests, I'm not sure how the implementation can be tested without a real iRODS server. Finally, this PR bumps the minimum iRODS version requirement to 4.3.2. A new version of irods4j will be needed before this is merged. See irods/irods4j#126. Will get a new version released |
irods/src/main/java/ch/cyberduck/core/irods/IRODSUploadFeature.java
Outdated
Show resolved
Hide resolved
irods/src/main/java/ch/cyberduck/core/irods/IRODSUploadFeature.java
Outdated
Show resolved
Hide resolved
irods/src/main/java/ch/cyberduck/core/irods/IRODSUploadFeature.java
Outdated
Show resolved
Hide resolved
|
@dkocher When I move a file in or out of a directory, I see a new iRODS connection get created. It disappears eventually, but not cleanly. Can you explain why Cyberduck creates a new connection every time a file is moved? The move class is very similar to other implementations so it's not clear to me what causes the new connection. |
You will need to return |
|
@dkocher When would someone choose stateless or stateful? To provide some context, a single iRODS connection cannot be used to execute multiple API operations in parallel. A single request is sent and the server returns a response. |
|
If you can share credentials with us for your test environment we can run daily integration tests from our CI. |
We will have to keep it stateful then as otherwise it will be attempted to use a single connection for multiple actions in parallel, i.e. when the user is browsing folders or a file transfer with multiple files in parallel. I will need to review how we can still support the native copy feature implementation for iRODS that would not require a new connection. |
We don't have a CI system for people to hook into yet. We have a small set of tools which make it easy to launch one or more iRODS servers for testing. It's likely overkill for your needs though. With that said, building a containerized environment for testing iRODS is pretty easy. I'm happy to put together a Docker compose project for the iRODS component. That will allow you to launch it on a local computer and have it available for testing.
So, because the If that's true, why is it that the Move operation results in connections which do not disconnect? No other operation shares that behavior. I added some log statements to my local build to try and box in what is leading to the additional connections, but it didn't help. However, it did reveal a high number of instantiations of |
|
We have other usages of Docker Compose containers in integration tests, thus that should be feasible. |
|
Where should I place the Docker Compose project? Is the test directory for irods appropriate? I figure you can move things around if needed. |
|
@dkocher What triggers the Copy implementation? Using the Duplicate option within the context menu doesn't appear to trigger it. |
|
Docker compose project added under test directory. Squashing everything down. |
22ffb27 to
949aac9
Compare
|
@dkocher Any updates regarding the CLA? |
70a3d38 to
e142de6
Compare
Released irods4j 0.5.0 and updated PR to use it. |
| @Test | ||
| public void testResource() { | ||
| final Host bookmark = new Host(new Profile(new IRODSProtocol(), new Deserializer<String>() { | ||
| @Override | ||
| public String stringForKey(final String key) { | ||
| return null; | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Restore this test.
The Duplicate… option in Cyberduck is expected to trigger the |
I have received your signed CLA and I should be able to merge this regardless of the auto check failing. |
|
That is true but the connections are pooled using the |
I do see references to
Whenever I tried running the tests without So, I can't confirm the state of the tests. I can say that clicking the buttons within the GUI have shown the desired behavior and do work with a live iRODS 4.3.4 server.
I'll take a look at those and see if I can mirror them. I may not be able to resolve the vault/permission related issues, but I can at least document the necessary changes so that you can wire things up in the way that you like.
I'll take a look at the FTP implementation. Given the connection management requires a deeper understanding of the Cyberduck internals, I might end up needing to let someone more familiar with that handle it. |
|
@dkocher Any thoughts on my previous comment? Specifically, the vault/permission issues? |
|
Unfortunately the secrets to access the credentials for integration tests are only accessible in our CI enviroment. Running the tests against |
This PR updates support for iRODS by replacing Jargon (legacy iRODS library) with irods4j.
The foundational work was implemented by @MINGYJ, a recent iRODS intern. My commits are mainly polish and corrections around the use of the irods4j library.
Basic functionality is working - i.e. single stream uploads/downloads, renames, editing, etc.
The parallel transfer implementation doesn't appear to be working as intended. This is likely due to not having a full understanding of how the Cyberduck components fit together - i.e. Read/WriteFeature vs Upload/DownloadFeature.
Here are the steps for performing parallel transfer (i.e. multipart uploads) in iRODS.
Putting in draft for now. Feedback and guidance on how to implement proper support for parallel transfer would be greatly appreciated.
Resolves #14449.