Open will-moore opened 1 year ago
Wanted to test with idr0054 data on pilot-zarr2-dev
...
Having logged-in and got FTP details from https://www.ebi.ac.uk/biostudies/submissions/files...
$ ssh pilot-zarr2-dev
$ sftp bsftp@ftp-private.ebi.ac.uk
write: Connection reset by peer
Couldn't read packet: Connection reset by peer
Trying from local machine:
$ sftp bsftp@ftp-private.ebi.ac.uk
kex_exchange_identification: read: Connection reset by peer
Connection reset by 193.62.193.142 port 22
Connection closed
Will try a different client...
Let's just try with Cyberduck and FileZilla from local machine... Grab the data...
$ rsync -rvP --progress pilot-zarr2-dev:/data/ngff/idr0054/ .
$ zip -r "Tonsil 1.ome.zarr.zip" "Tonsil 1.ome.zarr"
etc.
I can login with Cyberduck but can't work out how to use Cyberduck to upload to my "secret directory" on the server.
Manually uploaded zips via the web UI
https://www.ebi.ac.uk/biostudies/submissions/
Submitted -> https://www.ebi.ac.uk/biostudies/bioimages/studies/S-BIAD704
EDIT: Tried FileZilla and I can see how to upload files to the secret directory. I see the files there that I uploaded via the web UI.
From Matthew:
"Corresponding S3 URIs in our bucket for each NGFF fileset:"
Tonsil 2.ome.zarr.zip, https://uk1s3.embassy.ebi.ac.uk/bia-integrator-data/S-BIAD704/36cb5355-5134-4bdc-bde6-4e693055a8f9/36cb5355-5134-4bdc-bde6-4e693055a8f9.zarr/0
Tonsil 1.ome.zarr.zip, https://uk1s3.embassy.ebi.ac.uk/bia-integrator-data/S-BIAD704/5583fe0a-bbe6-4408-ab96-756e8e96af55/5583fe0a-bbe6-4408-ab96-756e8e96af55.zarr/0
Tonsil 3.ome.zarr.zip, https://uk1s3.embassy.ebi.ac.uk/bia-integrator-data/S-BIAD704/3b4a8721-1a28-4bc4-8443-9b6e145efbe9/3b4a8721-1a28-4bc4-8443-9b6e145efbe9.zarr/0
As discussed in IDR meeting today, I'll try to create a single goofys mount and look at how to use those mappings to create correct symlinks to the data on idr0125-pilot.
On idr0125-pilot:
$ sudo mkdir /bia-integrator-data && sudo /opt/goofys --endpoint https://uk1s3.embassy.ebi.ac.uk/ -o allow_other bia-integrator-data /bia-integrator-data
$ ls /bia-integrator-data/S-BIAD704
36cb5355-5134-4bdc-bde6-4e693055a8f9 3b4a8721-1a28-4bc4-8443-9b6e145efbe9 5583fe0a-bbe6-4408-ab96-756e8e96af55
Created: With https://github.com/IDR/idr-utils/pull/54/commits/2ce54a1eeeba661a22489c38d20b435c7d6807b9
# /tmp/idr0054_fileset_mappings.csv
Tonsil 2.ome.zarr,S-BIAD704/36cb5355-5134-4bdc-bde6-4e693055a8f9/36cb5355-5134-4bdc-bde6-4e693055a8f9.zarr
Tonsil 1.ome.zarr,S-BIAD704/5583fe0a-bbe6-4408-ab96-756e8e96af55/5583fe0a-bbe6-4408-ab96-756e8e96af55.zarr
Tonsil 3.ome.zarr,S-BIAD704/3b4a8721-1a28-4bc4-8443-9b6e145efbe9/3b4a8721-1a28-4bc4-8443-9b6e145efbe9.zarr
$ python idr-utils/scripts/managed_repo_symlinks.py Dataset:5601 /bia-integrator-data --fileset-mappings /tmp/idr0054_fileset_mappings.csv --report
fileset_dirs {'Tonsil 2.ome.zarr': 'S-BIAD704/36cb5355-5134-4bdc-bde6-4e693055a8f9/36cb5355-5134-4bdc-bde6-4e693055a8f9.zarr', 'Tonsil 1.ome.zarr': 'S-BIAD704/5583fe0a-bbe6-4408-ab96-756e8e96af55/5583fe0a-bbe6-4408-ab96-756e8e96af55.zarr', 'Tonsil 3.ome.zarr': 'S-BIAD704/3b4a8721-1a28-4bc4-8443-9b6e145efbe9/3b4a8721-1a28-4bc4-8443-9b6e145efbe9.zarr'}
Fileset: 5287119 /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-6/2023-05/18/09-50-49.857/
Render Image 5025551
fs_contents ['Tonsil 1.ome.zarr']
Link from /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-6/2023-05/18/09-50-49.857/Tonsil 1.ome.zarr to /bia-integrator-data/S-BIAD704/5583fe0a-bbe6-4408-ab96-756e8e96af55/5583fe0a-bbe6-4408-ab96-756e8e96af55.zarr
Fileset: 5287120 /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-1/2023-05/18/09-51-02.628/
Render Image 5025552
fs_contents ['Tonsil 2.ome.zarr']
Link from /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-1/2023-05/18/09-51-02.628/Tonsil 2.ome.zarr to /bia-integrator-data/S-BIAD704/36cb5355-5134-4bdc-bde6-4e693055a8f9/36cb5355-5134-4bdc-bde6-4e693055a8f9.zarr
Fileset: 5287121 /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-5/2023-05/18/09-51-13.702/
Render Image 5025553
fs_contents ['Tonsil 3.ome.zarr']
Link from /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-5/2023-05/18/09-51-13.702/Tonsil 3.ome.zarr to /bia-integrator-data/S-BIAD704/3b4a8721-1a28-4bc4-8443-9b6e145efbe9/3b4a8721-1a28-4bc4-8443-9b6e145efbe9.zarr
Viewing Image after symlink update above fails,
serverExceptionClass = ome.conditions.ResourceError
message = Error instantiating pixel buffer: /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-6/2023-05/18/09-50-49.857/Tonsil 1.ome.zarr/OME/METADATA.ome.xml
but the symlinks look OK:
$ ls -alh /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-6/2023-05/18/09-50-49.857/
total 0
drwxrwsr-x. 2 omero-server omero-server 31 May 29 13:00 .
drwxrwsr-x. 3 omero-server omero-server 50 May 18 09:50 ..
lrwxrwxrwx. 1 omero-server omero-server 109 May 29 13:00 Tonsil 1.ome.zarr -> /bia-integrator-data/S-BIAD704/5583fe0a-bbe6-4408-ab96-756e8e96af55/5583fe0a-bbe6-4408-ab96-756e8e96af55.zarr
$ cat /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-6/2023-05/18/09-50-49.857/Tonsil\ 1.ome.zarr/OME/METADATA.ome.xml
<?xml version="1.0" encoding="UTF-8"?><OME xmlns="http://www.openmicroscopy.org/Schemas/OME/2016-06" xmlns:xsi="http://www.w3.o....
Reverted the symlinks to previous values and that fixed the rendering in webclient:
NB: had to comment out # preview_image(conn, fileset_id, args)
in the script since that crashed with the ResourceError above.
$ python idr-utils/scripts/managed_repo_symlinks.py Dataset:5601 /idr0054/zarr/ --report
Fileset: 5287119 /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-6/2023-05/18/09-50-49.857/
fileset_dirs {}
fs_contents ['Tonsil 1.ome.zarr']
Link from /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-6/2023-05/18/09-50-49.857/Tonsil 1.ome.zarr to /idr0054/zarr/Tonsil 1.ome.zarr
Fileset: 5287120 /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-1/2023-05/18/09-51-02.628/
fileset_dirs {}
fs_contents ['Tonsil 2.ome.zarr']
Link from /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-1/2023-05/18/09-51-02.628/Tonsil 2.ome.zarr to /idr0054/zarr/Tonsil 2.ome.zarr
Fileset: 5287121 /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-5/2023-05/18/09-51-13.702/
fileset_dirs {}
fs_contents ['Tonsil 3.ome.zarr']
Link from /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-5/2023-05/18/09-51-13.702/Tonsil 3.ome.zarr to /idr0054/zarr/Tonsil 3.ome.zarr
I don't see any differences between what's in those locations:
$ ls -alh /data/OMERO/ManagedRepository/demo_2/Blitz-0-Ice.ThreadPool.Server-6/2023-05/18/09-50-49.857/Tonsil\ 1.ome.zarr/
total 17K
drwxr-xr-x. 2 root root 4.0K May 18 09:06 .
drwxr-xr-x. 2 root root 4.0K May 18 09:18 ..
drwxr-xr-x. 2 root root 4.0K May 18 09:18 0
drwxr-xr-x. 2 root root 4.0K May 18 09:18 OME
-rw-r--r--. 1 root root 33 May 18 09:06 .zattrs
-rw-r--r--. 1 root root 23 May 18 09:06 .zgroup
$ ls -alh /bia-integrator-data/S-BIAD704/5583fe0a-bbe6-4408-ab96-756e8e96af55/5583fe0a-bbe6-4408-ab96-756e8e96af55.zarr
total 17K
drwxr-xr-x. 2 root root 4.0K May 19 16:50 .
drwxr-xr-x. 2 root root 4.0K May 29 11:11 ..
drwxr-xr-x. 2 root root 4.0K May 29 11:11 0
drwxr-xr-x. 2 root root 4.0K May 19 16:50 OME
-rw-r--r--. 1 root root 33 May 19 16:49 .zattrs
-rw-r--r--. 1 root root 23 May 19 16:49 .zgroup
Checked a bunch of other dirs too - couldn't see any differences.
The Aspera instructions on BioStudies:
The Aspera ascp command line client is distributed as part of the Aspera CLI high-performance transfer browser plug-in which can be downloaded from here You will need to execute the downloaded file and switch to the CLI folder, e.g.,
$ sh ~/Documents/ibm-aspera-cli-3.9.6.1467.159c5b1-mac-10.11-64-release.sh
$ cd ~/Applications/Aspera\ CLI/bin
$ ./ascp -P33001 -i ../etc/asperaweb_id_dsa.openssh -d <directory to upload> bsaspera_w@hx-fasp-1.ebi.ac.uk:<secret directory>
where - -P33001 and bsaspera_w@hx-fasp-1.ebi.ac.uk defines port, user and server for Aspera connection. -
The download link there contains OSX
but even if I remove that I only see OSX
options to download. This will make it hard to install on the CentOS7 machines where we want to do the conversions etc.
@jburel pointed me at https://github.com/Euro-BioImaging/BatchConvert/
They upload to BIA via Aspera. The ascp
cli tool is installed via conda:
I followed that manually...
conda create --yes --name ascp2bia python=3.9
conda install -n ascp2bia -c hcc aspera-cli
aspera-cli hcc/osx-64::aspera-cli-3.9.6-hbec0bfc_0 None
You must agree to the license before using aspera-cli, http://www-03.ibm.com/software/sla/sladb.nsf/displaylis/2ABD3328689EBBFE8525830C007A5F38.
I copied the file at https://github.com/Euro-BioImaging/BatchConvert/blob/c3a89791416babd2681b718ba0f6a043f9249d7a/configs/asperaweb_id_dsa.openssh and saved it locally. This is normally included in the download of Aspera above.
$ conda activate ascp2bia
$ which ascp
/Users/wmoore/opt/anaconda3/envs/ascp2bia/bin/ascp
$ ascp -P33001 -i ~/.ssh/asperaweb_id_dsa.openssh -d Desktop/images/lif bsaspera_w@hx-fasp-1.ebi.ac.uk:**/*******************
Killed: 9
This might be failing because I haven't agreed to the license. Tried following http://www-03.ibm.com/software/sla/sladb.nsf/displaylis/2ABD3328689EBBFE8525830C007A5F38. but that redirects to License Information documents
https://www.ibm.com/support/customer/csol/terms/#license-search with no clear info on what I need to do. Just looks like documents for reference, not any license agreement form?
Signed up for IBM account and logged-in, but that didn't change what I saw at links above. Downloaded according to instructions from BioStudies...
$ cd Documents/Aspera/
$ sh ibm-aspera-cli-3.9.6.1467.159c5b1-mac-10.11-64-release.sh
Installing IBM Aspera CLI
Installation into /Users/wmoore/Applications/Aspera CLI successful
Optional installation steps:
To include aspera in your PATH, run this command (or add it to .bash_profile):
export PATH=/Users/wmoore/Applications/Aspera\ CLI/bin:$PATH
To install the man page, run the following command:
export MANPATH=/Users/wmoore/Applications/Aspera\ CLI/share/man:$MANPATH
$ which ascp
/Users/wmoore/Applications/Aspera CLI/bin/ascp
$ cd ~/Applications/Aspera\ CLI/bin
$ ./ascp -P33001 -i ../etc/asperaweb_id_dsa.openssh -d ~/Desktop/images/lif/ bsaspera_w@hx-fasp-1.ebi.ac.uk:xx/xxxxxxxxxxxxxxxxxxxxxxx
20191025 Test FRET 585. 423, 426.lif 100% 47MB 175Mb/s 00:02
Completed: 48157K bytes transferred in 3 seconds
(130222K bits/sec), in 1 file, 1 directory.
Success!
I see that you can choose the OS
in the BioStudies page to get the correct link for e.g. Linux:
On idr0125-pilot:
$ wget https://ak-delivery04-mul.dhe.ibm.com/sar/CMA/OSA/08q6g/0/ibm-aspera-cli-3.9.6.1467.159c5b1-linux-64-release.sh
Installing IBM Aspera CLI
Installation into /home/wmoore/.aspera/cli successful
Optional installation steps:
To include aspera in your PATH, run this command (or add it to .bash_profile):
export PATH=/home/wmoore/.aspera/cli/bin:$PATH
To install the man page, run the following command:
export MANPATH=/home/wmoore/.aspera/cli/share/man:$MANPATH
$ cd /.aspera/cli/bin
$ ./ascp -P3..... # worked as above!
For idr0054
on pilot-idr0125
, to debug symlinking to BioStudies s3, I updated the symlinks as above:
$ tail -f /opt/omero/server/OMERO.server/var/log/Blitz-0.log
cc @dgault @sbesson Any ideas what might be causing this error? java.lang.RuntimeException: java.lang.IllegalArgumentException: Invalid index: -1 at ome.io.bioformats.BfPixelBuffer.reader(BfPixelBuffer.java:79)
Meeting with Matthew today:
/idr0010/
- Can continue to add to this dir until submission is complete (doesn't need to all go in one FTP command). idr0054 NGFF ....
Discussion with Josh and Matthew on slack about "zip zarrs": https://openmicroscopy.slack.com/archives/C01ABANKH8V/p1687170670769479
Safer to stick with zipping the image.zarr
directory itself rather than trying to create a zip zarr by zipping the contents (less well tested at EBI).
Notes for upload to BioStudies workflow...
See https://www.ebi.ac.uk/biostudies/submissions/help#help-files and https://www.ebi.ac.uk/bioimage-archive/submit/