From 3328b25549ba38fe0b1c3d9f39d1d039d5570ecf Mon Sep 17 00:00:00 2001
From: Zach Dwiel <zach.dwiel@intel.com>
Date: Mon, 17 Sep 2018 19:50:03 +0000
Subject: [PATCH] reenable redis; better error message

---
 docker/Dockerfile          |  2 +-
 docker/Makefile            |  5 +++--
 rl_coach/rollout_worker.py | 11 +++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d29c4f6..c05d8bc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -30,4 +30,4 @@ RUN pip3 install -e .
 # RUN pip3 install rl_coach
 
 # CMD ["coach", "-p", "CartPole_PG", "-e", "cartpole"]
-CMD python3 rl_coach/rollout_worker.py --preset CartPole_PG
+# CMD python3 rl_coach/rollout_worker.py --preset CartPole_DQN_distributed
diff --git a/docker/Makefile b/docker/Makefile
index 5174c40..9bd680f 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -26,6 +26,7 @@ endif
 build:
 	${DOCKER} build -f=Dockerfile -t=${IMAGE} ${BUILD_ARGUMENTS} ${CONTEXT}
 	mkdir -p /tmp/checkpoint
+	rm -rf /tmp/checkpoint/*
 
 shell: build
 	${DOCKER} run ${RUN_ARGUMENTS} -it ${IMAGE} /bin/bash
@@ -37,10 +38,10 @@ run: build
 	${DOCKER} run ${RUN_ARGUMENTS} -it ${IMAGE}
 
 run_training_worker: build
-	${DOCKER} run ${RUN_ARGUMENTS} -it ${IMAGE} python3 rl_coach/training_worker.py --preset CartPole_PG
+	${DOCKER} run ${RUN_ARGUMENTS} -it ${IMAGE} python3 rl_coach/training_worker.py --preset CartPole_DQN_distributed
 
 run_rollout_worker: build
-	${DOCKER} run ${RUN_ARGUMENTS} -it ${IMAGE} python3 rl_coach/rollout_worker.py --preset CartPole_PG
+	${DOCKER} run ${RUN_ARGUMENTS} -it ${IMAGE} python3 rl_coach/rollout_worker.py --preset CartPole_DQN_distributed
 
 push:
 	docker push ${IMAGE}
diff --git a/rl_coach/rollout_worker.py b/rl_coach/rollout_worker.py
index 5b92140..8afde08 100644
--- a/rl_coach/rollout_worker.py
+++ b/rl_coach/rollout_worker.py
@@ -40,7 +40,11 @@ def wait_for_checkpoint(checkpoint_dir, timeout=10):
     if has_checkpoint(checkpoint_dir):
         return
 
-    raise ValueError('checkpoint never found in {checkpoint_dir}'.format(
+    raise ValueError((
+        'Waited {timeout} seconds, but checkpoint never found in'
+        ' {checkpoint_dir}'
+    ).format(
+        timeout=timeout,
         checkpoint_dir=checkpoint_dir,
     ))
 
@@ -82,9 +86,8 @@ def main():
 
     graph_manager = short_dynamic_import(expand_preset(args.preset), ignore_module_case=True)
 
-    # TODO: get this working, this expects that memory already has a redis ip and port
-    # graph_manager.agent_params.memory.redis_ip = args.redis_ip
-    # graph_manager.agent_params.memory.redis_port = args.redis_port
+    graph_manager.agent_params.memory.redis_ip = args.redis_ip
+    graph_manager.agent_params.memory.redis_port = args.redis_port
 
     rollout_worker(
         graph_manager=graph_manager,