Skip to content

Commit

Permalink
Upgrade to Milton 2.6
Browse files Browse the repository at this point in the history
Appears to be working. Solves the problem where proxied vector reads cause the entire
file to be written to local disk. Instead only the actual data that is to be returned
to the client is buffered. If this is more than 100 KB, that data is buffered on local
disk. The file is deleted after successful return of the data.

There are still problems though: In case of failures reading the data from the pool,
the temporary file is not deleted. The entire file is still downloaded from the pool
to the door (even when only the requested data is buffered), and the multi-range writer
in Milton is extremely inefficient as it processes one byte at a time (it fails to
override the multi-byte write methods).

The new version supports using cookies to remeber when a client has already logged in.
I disabled this feature for now.

Target: trunk
Request: 2.11
Request: 2.10
Request: 2.9
Request: 2.8
Request: 2.7
Request: 2.6
Require-notes: yes
Require-book: no
Acked-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
Patch: https://rb.dcache.org/r/7530/
(cherry picked from commit b0f88c5)

Conflicts:
	pom.xml

(cherry picked from commit a510d81)

Conflicts:
	pom.xml
  • Loading branch information
gbehrmann committed Nov 28, 2014
1 parent 39dadfa commit 27783b3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,14 @@ public void respondHead(Resource resource, Response response, Request request)
rfc3230(resource, response);
}

@Override
public void respondPartialContent(GetableResource resource, Response response, Request request, Map<String, String> params, List<Range> ranges)
throws NotAuthorizedException, BadRequestException, NotFoundException
{
super.respondPartialContent(resource, response, request, params, ranges);
rfc3230(resource, response);
}

@Override
public void respondPartialContent(GetableResource resource,
Response response, Request request, Map<String,String> params,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@
<property name="enableExpectContinue" value="false"/>
<property name="enableCompression" value="false"/>
<property name="enableFormAuth" value="false"/>
<property name="enableCookieAuth" value="false"/>
<property name="resourceFactory" ref="resource-factory"/>
<property name="buffering" value="never"/>
<property name="staticContentPath" value="${webdav.static-content.location}"/>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<target.version>1.7</target.version>

<version.slf4j>1.7.6</version.slf4j>
<version.milton>2.3.0.7</version.milton>
<version.milton>2.6.3.3</version.milton>
<version.spring>4.0.5.RELEASE</version.spring>
<!-- Remember to sync aspectj version in dcache.properties -->
<version.aspectj>1.8.1</version.aspectj>
Expand Down

0 comments on commit 27783b3

Please sign in to comment.