From cb55ab4f5f0130203faf1eb4ceadab2a41401598 Mon Sep 17 00:00:00 2001
From: nickfelt <nickfelt@google.com>
Date: Fri, 9 Sep 2016 08:09:03 -0700
Subject: [PATCH] Convert straggler GAE modules to basic-scaling

This fixes the proximate cause of b/31380927 and makes alpha frontend usable
again.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=132675121
---
 .../env/alpha/default/WEB-INF/appengine-web.xml     | 13 +++++--------
 .../env/crash/default/WEB-INF/appengine-web.xml     | 13 +++++--------
 .../env/local/default/WEB-INF/appengine-web.xml     | 13 +++++--------
 3 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml b/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
index 625375fa2..7c5654228 100644
--- a/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
@@ -6,14 +6,11 @@
   <module>default</module>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
-  <instance-class>F4_1G</instance-class>
-  <automatic-scaling>
-    <min-idle-instances>0</min-idle-instances>
-    <max-idle-instances>automatic</max-idle-instances>
-    <min-pending-latency>automatic</min-pending-latency>
-    <max-pending-latency>100ms</max-pending-latency>
-    <max-concurrent-requests>10</max-concurrent-requests>
-  </automatic-scaling>
+  <instance-class>B4_1G</instance-class>
+  <basic-scaling>
+    <max-instances>10</max-instances>
+    <idle-timeout>10m</idle-timeout>
+  </basic-scaling>
 
   <system-properties>
     <property name="java.util.logging.config.file"
diff --git a/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml b/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
index 4dd7927b1..ac8696486 100644
--- a/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
@@ -6,14 +6,11 @@
   <module>default</module>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
-  <instance-class>F4_1G</instance-class>
-  <automatic-scaling>
-    <min-idle-instances>0</min-idle-instances>
-    <max-idle-instances>automatic</max-idle-instances>
-    <min-pending-latency>automatic</min-pending-latency>
-    <max-pending-latency>100ms</max-pending-latency>
-    <max-concurrent-requests>10</max-concurrent-requests>
-  </automatic-scaling>
+  <instance-class>B4_1G</instance-class>
+  <basic-scaling>
+    <max-instances>10</max-instances>
+    <idle-timeout>10m</idle-timeout>
+  </basic-scaling>
 
   <system-properties>
     <property name="java.util.logging.config.file"
diff --git a/java/google/registry/env/local/default/WEB-INF/appengine-web.xml b/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
index 183b45cb4..417f55af5 100644
--- a/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
+++ b/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
@@ -6,14 +6,11 @@
   <module>default</module>
   <threadsafe>true</threadsafe>
   <sessions-enabled>true</sessions-enabled>
-  <instance-class>F4_1G</instance-class>
-  <automatic-scaling>
-    <min-idle-instances>1</min-idle-instances>
-    <max-idle-instances>automatic</max-idle-instances>
-    <min-pending-latency>automatic</min-pending-latency>
-    <max-pending-latency>100ms</max-pending-latency>
-    <max-concurrent-requests>10</max-concurrent-requests>
-  </automatic-scaling>
+  <instance-class>B4_1G</instance-class>
+  <basic-scaling>
+    <max-instances>10</max-instances>
+    <idle-timeout>10m</idle-timeout>
+  </basic-scaling>
 
 
   <system-properties>