Merge branch 'master' into yifeim-patch-1

Author: nikhil-sk

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.5.6 (2021-12-09)
+
+### Bug Fixes and Other Changes
+
+ * Increase timeout for starting model server to 10 minutes
+ * Fixing issue #82
+
 ## v1.5.5 (2021-01-30)
 
 ### Bug Fixes and Other Changes

VERSION

@@ -1 +1 @@
-1.5.6.dev0
+1.5.7.dev0

buildspec-release.yml

@@ -1,5 +1,10 @@
 version: 0.2
 
+env:
+  variables:
+    LC_ALL: "C.UTF-8"
+    LANG: "C.UTF-8"
+
 phases:
   pre_build:
     commands:

buildspec.yml

@@ -1,5 +1,10 @@
 version: 0.2
 
+env:
+  variables:
+    LC_ALL: "C.UTF-8"
+    LANG: "C.UTF-8"
+
 phases:
   pre_build:
     commands:
@@ -30,4 +35,4 @@ phases:
       - cd ../..
 
       # run local integration tests
-      - IGNORE_COVERAGE=- tox -e py27,py36,py37 -- test/integration/local
+      - IGNORE_COVERAGE=- tox -e py27,py36,py37 -- -s test/integration/local 

src/sagemaker_inference/model_server.py

@@ -194,8 +194,8 @@ def _install_requirements():
         raise ValueError("failed to install required packages")
 
 
-# retry for 10 seconds
-@retry(stop_max_delay=10 * 1000)
+# retry for 10 minutes
+@retry(wait_fixed=1000, stop_max_delay=10 * 60 * 1000)
 def _retrieve_mms_server_process():
     mms_server_processes = list()
 

test/integration/local/test_dummy_multi_model.py

@@ -38,7 +38,7 @@ def container():
         proc = subprocess.Popen(command.split(), stdout=sys.stdout, stderr=subprocess.STDOUT)
 
         attempts = 0
-        while attempts < 5:
+        while attempts < 10:
             time.sleep(3)
             try:
                 requests.get(PING_URL)

test/integration/local/test_mxnet_multi_model.py

@@ -38,7 +38,7 @@ def container():
         proc = subprocess.Popen(command.split(), stdout=sys.stdout, stderr=subprocess.STDOUT)
 
         attempts = 0
-        while attempts < 5:
+        while attempts < 10:
             time.sleep(3)
             try:
                 requests.get(PING_URL)