Skip to content
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

argus: set 32MiB tap_upload limit #148

Merged
merged 1 commit into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions argus/src/main/java/org/opencadc/argus/UploadManagerImpl.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,21 @@
package org.opencadc.argus;

import ca.nrc.cadc.tap.BasicUploadManager;
import ca.nrc.cadc.tap.upload.UploadLimits;

/**
*
* @author pdowler
*/
public class UploadManagerImpl extends BasicUploadManager {

/**
* Default maximum number of rows allowed in the UPLOAD VOTable.
*/
public static final int MAX_UPLOAD_ROWS = 100000;
private static final UploadLimits UPL;

static {
UPL = new UploadLimits(32 * 1024L * 1024L); // 32 MiB
}

public UploadManagerImpl() {
super(MAX_UPLOAD_ROWS);
super(UPL);
}
}
6 changes: 3 additions & 3 deletions argus/src/main/webapp/capabilities.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,16 @@
<hard>600</hard>
</executionDuration>

<!-- outputLimit for async queries: 128MB -->
<!-- outputLimit for async queries: 128MiB -->
<outputLimit>
<default unit="byte">134217728</default>
<hard unit="byte">134217728</hard>
</outputLimit>
<!-- outputLimit for sync queries: no limit -->

<!-- tap_upload limit: 32MiB -->
<uploadLimit>
<default unit="row">100000</default>
<hard unit="row">100000</hard>
<hard unit="byte">33554432</hard>
</uploadLimit>

</capability>
Expand Down
Loading