Update RMR version in listener image

The RMR version was bumpped to 4.7.0 in the listener image in order
to allow the listener to stash the latest route table received
from routing manager.  The start script was changed to set the
new RMR variable that points to the location of the stashed table.

Issue-ID: RIC-776

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: Ic78114fe44c55634e10cf632107b94af2a3591b2
Signed-off-by: E. Scott Daniels <daniels@research.att.com>

diff --git a/mc-core/Dockerfile b/mc-core/Dockerfile
index 56b4765..6bd4bf7 100644 (file)
--- a/mc-core/Dockerfile
+++ b/mc-core/Dockerfile
@@ -16,7 +16,8 @@
 
 ARG STAGE_DIR=/mc
 
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 AS project-build
+# builders are now in release (10002)
+FROM nexus3.o-ran-sc.org:10002/o-ran-sc/bldr-ubuntu18-c-go:1.9.0 AS project-build
 
 ARG STAGE_DIR
 
@@ -49,6 +50,10 @@ RUN make clean
 RUN make
 RUN make install
 RUN ldconfig
+
+# hack to get protobufs to build
+RUN cp src/google/protobuf/stubs/int128.h /usr/local/include/google/protobuf/stubs
+
 WORKDIR ${STAGE_DIR}
 RUN git clone https://github.com/protobuf-c/protobuf-c.git
 WORKDIR protobuf-c

diff --git a/mc-core/container_start.sh b/mc-core/container_start.sh
index 40008f9..ea3d3a9 100755 (executable)
--- a/mc-core/container_start.sh
+++ b/mc-core/container_start.sh
@@ -62,6 +62,11 @@ then
        # --- start "sidecars" first. They are expected to need /playpen as the working dir
 
        (
+               export RMR_SEED_RT=/tmp/empty.rt                # must ensure this exists; we won't use
+               export RMR_STASH_RT=/tmp/stash.rt               # listener's rmr will stash the table received from RM
+               >$RMR_SEED_RT
+               >$RMR_STASH_RT                                                  # mc-core apps will set this as their seed; it must be emptied here
+
                cd /playpen
                if [ "$RMR_PORT" != "" ]
                then
@@ -71,7 +76,7 @@ then
                fi
        ) >/tmp/listener.std 2>&1 &
 
-       echo "listener was started" >&2
+       echo "$(date) listener was started; stashing route tables in $RMR_STASH_RT" >&2
 
        trap 'unreg' EXIT 1 2 3 4 15                            # unregister on exit/hup/quit/term
        /playpen/bin/xam_register.sh                            # register the xapp now that listener is up
@@ -80,5 +85,8 @@ fi
 
 # ---- finally, start the core MC application -----------------------------
 cd ${GSLITE_ROOT:-/mc/gs-lite}/demo/queries
+
+export RMR_SEED_RT=/tmp/stash.rt               # must match above; place where "writers" will pick up the route table
+export RMR_RTG_SVC=-1                                  # force all writers to use only the seed rt
 ./runall
 

diff --git a/rmr-version.yaml b/rmr-version.yaml
index c9bf028..5a6a8f4 100644 (file)
--- a/rmr-version.yaml
+++ b/rmr-version.yaml
@@ -1,6 +1,6 @@
 # causes CI job(s) to install RMR with the desired version
 ---
-version: 4.5.2
-repo: staging
+version: 4.7.0
+repo: release
 
 

diff --git a/sidecars/listener/Dockerfile b/sidecars/listener/Dockerfile
index b01a0aa..d199277 100644 (file)
--- a/sidecars/listener/Dockerfile
+++ b/sidecars/listener/Dockerfile
@@ -50,7 +50,7 @@ RUN apt-get update && apt-get install -y cmake gcc make git g++ wget
 
 WORKDIR /playpen
 # Install RMr (runtime and dev) from debian package cached on packagecloud.io
-ARG RMR_VER=4.5.2
+ARG RMR_VER=4.7.0
 ARG RMR_PC_REPO=release
 #ARG RMR_PC_REPO=staging
 

diff --git a/sidecars/listener/container-tag.yaml b/sidecars/listener/container-tag.yaml
index c918110..40f777c 100644 (file)
--- a/sidecars/listener/container-tag.yaml
+++ b/sidecars/listener/container-tag.yaml
@@ -1,4 +1,4 @@
 ---
-tag: '1.10.1'
+tag: '1.11.0'
 
 # this is used by CI jobs to apply a tag when it builds the image