From 2d38c4ece8ba9dd5221bdc8256365d8e1dd206df Mon Sep 17 00:00:00 2001
From: David Heryanto <david.heryanto@hotmail.com>
Date: Tue, 25 Feb 2020 10:16:40 +0800
Subject: [PATCH] Fix fastavro version used in Feast to avoid Timestamp delta
 error (#490)

* Fix fastavro version used in feast to 0.22.9

* Print python packages version used when e2e test fails

(cherry picked from commit 7586da644c16c2d96f63eee4783d600b013f502d)
---
 .prow/scripts/test-end-to-end-batch.sh | 9 +++++++++
 .prow/scripts/test-end-to-end.sh       | 9 +++++++++
 sdk/python/setup.py                    | 4 +++-
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.prow/scripts/test-end-to-end-batch.sh b/.prow/scripts/test-end-to-end-batch.sh
index ac312391d5..4d1b1d2ecd 100755
--- a/.prow/scripts/test-end-to-end-batch.sh
+++ b/.prow/scripts/test-end-to-end-batch.sh
@@ -235,6 +235,15 @@ set +e
 pytest bq-batch-retrieval.py --junitxml=${LOGS_ARTIFACT_PATH}/python-sdk-test-report.xml
 TEST_EXIT_CODE=$?
 
+if [[ ${TEST_EXIT_CODE} != 0 ]]; then
+  echo "[DEBUG] Printing logs"
+  ls -ltrh /var/log/feast*
+  cat /var/log/feast-serving-warehouse.log /var/log/feast-core.log
+
+  echo "[DEBUG] Printing Python packages list"
+  pip list
+fi
+
 cd ${ORIGINAL_DIR}
 exit ${TEST_EXIT_CODE}
 
diff --git a/.prow/scripts/test-end-to-end.sh b/.prow/scripts/test-end-to-end.sh
index cc65968ca2..45cb9c82ae 100755
--- a/.prow/scripts/test-end-to-end.sh
+++ b/.prow/scripts/test-end-to-end.sh
@@ -225,5 +225,14 @@ set +e
 pytest basic-ingest-redis-serving.py --junitxml=${LOGS_ARTIFACT_PATH}/python-sdk-test-report.xml
 TEST_EXIT_CODE=$?
 
+if [[ ${TEST_EXIT_CODE} != 0 ]]; then
+  echo "[DEBUG] Printing logs"
+  ls -ltrh /var/log/feast*
+  cat /var/log/feast-serving-online.log /var/log/feast-core.log
+
+  echo "[DEBUG] Printing Python packages list"
+  pip list
+fi
+
 cd ${ORIGINAL_DIR}
 exit ${TEST_EXIT_CODE}
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index d0b37ad941..3fc77540c0 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -37,7 +37,9 @@
     "pandavro==1.5.*",
     "protobuf>=3.10",
     "PyYAML==5.1.*",
-    "fastavro==0.*",
+    # fastavro 0.22.10 and newer will throw this error for e2e batch test:
+    # TypeError: Timestamp subtraction must have the same timezones or no timezones
+    "fastavro==0.22.9",
     "kafka-python==1.*",
     "tabulate==0.8.*",
     "toml==0.10.*",