use python for push-to-es until we upgrade to py3 for pypy

examples/config/es6_supervisor.conf

@@ -31,7 +31,7 @@ user=ec2-user
 environment=JAVA_HOME=/usr/java/default
 
 [program:push_to_es]
-command=/home/ec2-user/pypy/bin/pypy activedata_etl/push_to_es.py --settings=resources/settings/staging/push_to_es.json
+command=python activedata_etl/push_to_es.py --settings=resources/settings/staging/push_to_es.json
 directory=/home/ec2-user/ActiveData-ETL
 autostart=true
 process_name=%(process_num)02d

examples/es6.py

@@ -48,7 +48,7 @@ class ES6Spot(InstanceManager):
                 gigabytes = mo_math.floor(utility.memory)
                 Log.note("setup {{instance}}", instance=instance.id)
 
-                _install_pypy_indexer(instance=instance, conn=conn)
+                _install_python_indexer(instance=instance, conn=conn)
                 _install_es(gigabytes, instance=instance, conn=conn)
                 _install_supervisor(instance=instance, conn=conn)
                 _start_supervisor(conn=conn)
@@ -205,7 +205,7 @@ def _install_python_indexer(instance, conn):
     with conn.cd("/home/ec2-user/ActiveData-ETL/"):
         conn.run("git checkout push-to-es6")
         conn.sudo("yum -y install gcc")  # REQUIRED FOR psutil
-        conn.run("~/pypy/bin/pypy -m pip install -r requirements.txt")
+        conn.run("python -m pip install -r requirements.txt")
 
     conn.put("~/private_active_data_etl.json", "/home/ec2-user/private.json")
 
@@ -216,7 +216,7 @@ def _install_python(instance, conn):
     else:
         pip_version = ""
 
-    if not pip_version.startswith("pip 18."):
+    if not pip_version.startswith("pip 20."):
         conn.sudo("yum -y install python2")
         conn.sudo("easy_install pip")
         # conn.sudo("rm -f /usr/bin/pip", warn=True)

spot/spot_manager.py

@@ -437,6 +437,7 @@ class SpotManager(object):
             bad_requests = Data()
             setup_threads = []
             last_get = Date.now()
+            setup_in_progress = set()
 
             while not please_stop:
                 spot_requests = self._get_managed_spot_requests()
@@ -449,6 +450,7 @@ class SpotManager(object):
                        and (
                            not i.tags.get("Name") or i.tags.get("Name") == self.settings.ec2.instance.name + " (setup)"
                        )
+                       and i.id not in setup_in_progress
                        and i._state.name == "running"
                        and Date.now() > Date(i.launch_time) + DELAY_BEFORE_SETUP
                 ]
@@ -476,6 +478,7 @@ class SpotManager(object):
 
                         i.markup = p
                         i.add_tag("Name", self.settings.ec2.instance.name + " (setup)")
+                        setup_in_progress.add(i.id)
                         setup_threads.append(Thread.run(
                             "setup for " + text(i.id),
                             track_setup,