gCubeSystem
/
sh-fuse-integration
15
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

some log added

This commit is contained in:
lucio.lelii 2021-01-21 19:28:05 +01:00
parent 8248bd6111
commit 97184640f1
3 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
FUNDING.md
View File

@ -1,26 +0,0 @@
# Acknowledgments
The projects leading to this software have received funding from a series of European Union programmes including:
- the Sixth Framework Programme for Research and Technological Development
- [DILIGENT](https://cordis.europa.eu/project/id/004260) (grant no. 004260).
- the Seventh Framework Programme for research, technological development and demonstration
- [D4Science](https://cordis.europa.eu/project/id/212488) (grant no. 212488);
- [D4Science-II](https://cordis.europa.eu/project/id/239019) (grant no.239019);
- [ENVRI](https://cordis.europa.eu/project/id/283465) (grant no. 283465);
- [iMarine](https://cordis.europa.eu/project/id/283644) (grant no. 283644);
- [EUBrazilOpenBio](https://cordis.europa.eu/project/id/288754) (grant no. 288754).
- the H2020 research and innovation programme
- [SoBigData](https://cordis.europa.eu/project/id/654024) (grant no. 654024);
- [PARTHENOS](https://cordis.europa.eu/project/id/654119) (grant no. 654119);
- [EGI-Engage](https://cordis.europa.eu/project/id/654142) (grant no. 654142);
- [ENVRI PLUS](https://cordis.europa.eu/project/id/654182) (grant no. 654182);
- [BlueBRIDGE](https://cordis.europa.eu/project/id/675680) (grant no. 675680);
- [PerformFISH](https://cordis.europa.eu/project/id/727610) (grant no. 727610);
- [AGINFRA PLUS](https://cordis.europa.eu/project/id/731001) (grant no. 731001);
- [DESIRA](https://cordis.europa.eu/project/id/818194) (grant no. 818194);
- [ARIADNEplus](https://cordis.europa.eu/project/id/823914) (grant no. 823914);
- [RISIS 2](https://cordis.europa.eu/project/id/824091) (grant no. 824091);
- [EOSC-Pillar](https://cordis.europa.eu/project/id/857650) (grant no. 857650);
- [Blue Cloud](https://cordis.europa.eu/project/id/862409) (grant no. 862409);
- [SoBigData-PlusPlus](https://cordis.europa.eu/project/id/871042) (grant no. 871042);

7
src/main/java/org/gcube/data/access/storagehub/fs/FileDownload.java
View File

@ -23,6 +23,7 @@ public class FileDownload implements SHFile{
AbstractFileItem fileItem;
File output;
private long start = System.currentTimeMillis();
public FileDownload(FileContainer fileContainer) throws Exception {
StreamDescriptor stream = fileContainer.download();
@ -36,7 +37,7 @@ public class FileDownload implements SHFile{
}
fo.flush();
}
logger.info("download took {}", System.currentTimeMillis()-start);
fileItem = fileContainer.get();
@ -53,6 +54,7 @@ public class FileDownload implements SHFile{
int bytesToRead = (int) (size);
byte[] mybuf = new byte[bytesToRead];
int readTotal= 0;
try {
raf = new RandomAccessFile(output, "r");
raf.seek(offset);
@ -79,9 +81,10 @@ public class FileDownload implements SHFile{
public synchronized int flush() {
public int flush() {
logger.trace("called flush");
output.delete();
logger.info("file {} took {}", fileItem.getName(), System.currentTimeMillis()-start);
return 0;
}

12
src/main/java/org/gcube/data/access/storagehub/fs/StorageHubFS.java
View File

@ -57,7 +57,9 @@ public class StorageHubFS extends FuseStubFS {
private FolderContainer rootDirectory;
public StorageHubFS(String token, String scope) {
super();
this.token = token;
this.scope = scope;
@ -81,7 +83,7 @@ public class StorageHubFS extends FuseStubFS {
ScopeProvider.instance.set(scope);
SecurityTokenProvider.instance.set(token);
logger.trace(Thread.currentThread().getName()+" ) calling write "+ size+" "+offset);
logger.trace("{}) calling write {} - {} ",Thread.currentThread().getName(), size , offset);
SHFile file = tempFiles.get(path);
return file.write(buf, size, offset);
@ -89,7 +91,7 @@ public class StorageHubFS extends FuseStubFS {
@Override
public int flush(String path, FuseFileInfo fi) {
logger.trace("called flush for "+path);
logger.trace("called flush for {} ",path);
SHFile file = tempFiles.get(path);
file.flush();
if (!(file instanceof FileUpload)) {
@ -158,7 +160,7 @@ public class StorageHubFS extends FuseStubFS {
@Override
public synchronized int getattr(String path, FileStat stat) {
public int getattr(String path, FileStat stat) {
ScopeProvider.instance.set(scope);
SecurityTokenProvider.instance.set(token);
@ -219,7 +221,7 @@ public class StorageHubFS extends FuseStubFS {
//stat.st_birthtime.tv_nsec.set(item.getLastModificationTime().toInstant().getNano());
}
@Override
public int mkdir(String path, @mode_t long mode) {
@ -252,7 +254,7 @@ public class StorageHubFS extends FuseStubFS {
* @see ru.serce.jnrfuse.FuseStubFS#write(java.lang.String, jnr.ffi.Pointer, long, long, ru.serce.jnrfuse.struct.FuseFileInfo)
*/
@Override
public synchronized int read(String path, Pointer buf, @size_t long size, @off_t long offset, FuseFileInfo fi) {
public int read(String path, Pointer buf, @size_t long size, @off_t long offset, FuseFileInfo fi) {
ScopeProvider.instance.set(scope);
SecurityTokenProvider.instance.set(token);