From 6ee51080a843d99aeb75471096086c1c5bd50e3e Mon Sep 17 00:00:00 2001
From: Patrick Dowler <pdowler.cadc@gmail.com>
Date: Mon, 18 Mar 2024 14:38:01 -0700
Subject: [PATCH] argus: set 32MiB tap_upload limit

---
 .../java/org/opencadc/argus/UploadManagerImpl.java   | 12 +++++++-----
 argus/src/main/webapp/capabilities.xml               |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/argus/src/main/java/org/opencadc/argus/UploadManagerImpl.java b/argus/src/main/java/org/opencadc/argus/UploadManagerImpl.java
index 4e37eb6..980dd4c 100644
--- a/argus/src/main/java/org/opencadc/argus/UploadManagerImpl.java
+++ b/argus/src/main/java/org/opencadc/argus/UploadManagerImpl.java
@@ -68,6 +68,7 @@
 package org.opencadc.argus;
 
 import ca.nrc.cadc.tap.BasicUploadManager;
+import ca.nrc.cadc.tap.upload.UploadLimits;
 
 /**
  *
@@ -75,12 +76,13 @@
  */
 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);
     }
 }
diff --git a/argus/src/main/webapp/capabilities.xml b/argus/src/main/webapp/capabilities.xml
index 1b63745..d125f48 100644
--- a/argus/src/main/webapp/capabilities.xml
+++ b/argus/src/main/webapp/capabilities.xml
@@ -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>