1842 nginx sendfile #37
Conversation
|
@aphelionz I have no review of this as yet and need to merge it in order to complete file download. |
views.py
Outdated
| name=path.split('/')[-1]) | ||
| response['X-Accel-Redirect'] = os.path.join( | ||
| getattr(settings, 'IRODS_USER_URI', '/irods-user'), path) | ||
| return response |
There was a problem hiding this comment.
@alvacouch the path passed in by the download request does not include federation path, but instead only include resource uuid. The download view function get resource object from uuid and pre-concatenate federation path with the request path to create the right path for iget call. So I think instead to check the federation path here, you can put different processing logic into below around line 55-56, so there is no wasted processing of pre-concatenating federation path, followed by removing federation path with extra conditional checking.
There was a problem hiding this comment.
@hyi @aphelionz As far as I know, this is incorrect. That request includes only the resource id if the request is not federated. If it's federated by -- e.g. -- having a user federation path, that path is appended. I strip that off and then forward the request to nginx. This is the only way I know that the request is federated. This seems to work! I do not understand what you mean by modifying the code below because in this case, that code is not executed at all.
|
@hyi @aphelionz I think some context is in order. This PR intercepts the request after it has been redirected to the django_irods download_file URI. This request is unqualified if local, and qualified with the federation path if not local. The PR changes things so that nginx handles requests of two types:
The way this works is that these two kinds of requests are translated into custom nginx calls, so that the file can be transferred via the operating system rather than via nginx. These paths are arbitrary and map to mount points in the nginx container. Thus the function of this is very much dependent upon nginx configuration. In Nginx:
These paths are only loosely related to the irods federation path. |
use NGINX configuration.
|
@alvacouch Thanks for the helpful context. Do you need the federation path to be able to do the mounting? If not, perhaps a flag that indicates whether the downloaded file comes from data or user zone would be sufficient? |
|
@alvacouch On second thought, a flag is most likely not sufficient since the resource could come from a third party federated zone. It looks like the federation path may be needed after all. The initial implementation of this download view function actually did use federation absolute logical path in the download URL as path parameter, then it was changed to remove the federation path since it was decided at the time it was not good to expose the whole federation path. Anyway, if the whole path is needed to mount the vault for nginx to send the file, I am fine with including the whole path in the download URL. However, I believe the url mapper view function also needs to be changed to accommodate this when mapping the download URL to the uniform URL used in resourcemap xml file. |
Changes necessary to utilize nginx sendfile.