[devel] [PATCH 2/2] osaf: update etcd2 and sample plugins [#2954]

[Gary Lee]

add timeout parameter to set and set_if_prev
---
 src/osaf/consensus/plugins/etcd.plugin   | 20 ++++++++++++--------
 src/osaf/consensus/plugins/sample.plugin | 16 ++++++++++------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/osaf/consensus/plugins/etcd.plugin 
b/src/osaf/consensus/plugins/etcd.plugin
index b585bb657..f62cc892b 100644
--- a/src/osaf/consensus/plugins/etcd.plugin
+++ b/src/osaf/consensus/plugins/etcd.plugin
@@ -45,15 +45,17 @@ get() {
 # params:
 #   $1 - <key>
 #   $2 - <value>
+#   $3 - <timeout>
 # returns:
 #   0 - success
 #   non-zero - failure
 setkey() {
   readonly key="$1"
   readonly value="$2"
+  readonly timeout="$3"
 
   if etcdctl $etcd_options --timeout $etcd_timeout set "$directory$key" \
-    "$value" >/dev/null
+    "$value" --ttl "$timeout" >/dev/null
   then
     return 0
   else
@@ -98,6 +100,7 @@ create_key() {
 #   $1 - <key>
 #   $2 - <value>
 #   $3 - <prev>
+#   $4 - <timeout>
 # returns:
 #   0 - success
 #   non-zero - failure
@@ -105,9 +108,10 @@ setkey_match_prev() {
   readonly key="$1"
   readonly value="$2"
   readonly prev="$3"
+  readonly timeout="$4"
 
   if etcdctl $etcd_options --timeout $etcd_timeout set "$directory$key" \
-    "$value" --swap-with-value "$prev" >/dev/null
+    "$value" --swap-with-value "$prev" --ttl "$timeout" >/dev/null
   then
     return 0
   else
@@ -263,19 +267,19 @@ case "$1" in
     exit $?
     ;;
   set)
-    if [ "$#" -ne 3 ]; then
-      echo "Usage: $0 set <key> <value>"
+    if [ "$#" -ne 4 ]; then
+      echo "Usage: $0 set <key> <value> <timeout>"
       exit 1
     fi
-    setkey "$2" "$3"
+    setkey "$2" "$3" "$4"
     exit $?
     ;;
   set_if_prev)
-    if [ "$#" -ne 4 ]; then
-      echo "Usage: $0 set <key> <value> <previous_value>"
+    if [ "$#" -ne 5 ]; then
+      echo "Usage: $0 set <key> <value> <previous_value> <timeout>"
       exit 1
     fi
-    setkey_match_prev "$2" "$3" "$4"
+    setkey_match_prev "$2" "$3" "$4" "$5"
     exit $?
     ;;
   create)
diff --git a/src/osaf/consensus/plugins/sample.plugin 
b/src/osaf/consensus/plugins/sample.plugin
index 6f6c71f6f..fc4c54c17 100644
--- a/src/osaf/consensus/plugins/sample.plugin
+++ b/src/osaf/consensus/plugins/sample.plugin
@@ -35,12 +35,14 @@ get() {
 # params:
 #   $1 - <key>
 #   $2 - <value>
+#   $3 - <timeout>
 # returns:
 #   0 - success
 #   non-zero - failure
 setkey() {
   readonly key="$1"
   readonly value="$2"
+  readonly timeout="$3"
   ...
 }
 
@@ -69,6 +71,7 @@ create_key() {
 #   $1 - <key>
 #   $2 - <value>
 #   $3 - <prev>
+#   $4 - <timeout>
 # returns:
 #   0 - success
 #   non-zero - failure
@@ -76,6 +79,7 @@ setkey_match_prev() {
   readonly key="$1"
   readonly value="$2"
   readonly prev="$3"
+  readonly timeout="$4"
   ...
 }
 
@@ -155,19 +159,19 @@ case "$1" in
     exit $?
     ;;
   set)
-    if [ "$#" -ne 3 ]; then
-      echo "Usage: $0 set <key> <value>"
+    if [ "$#" -ne 4 ]; then
+      echo "Usage: $0 set <key> <value> <timeout>"
       exit 1
     fi
-    setkey "$2" "$3"
+    setkey "$2" "$3" "$4"
     exit $?
     ;;
   set_if_prev)
-    if [ "$#" -ne 4 ]; then
-      echo "Usage: $0 set <key> <value> <previous_value>"
+    if [ "$#" -ne 5 ]; then
+      echo "Usage: $0 set <key> <value> <previous_value> <timeout>"
       exit 1
     fi
-    setkey_match_prev "$2" "$3" "$4"
+    setkey_match_prev "$2" "$3" "$4" "$5"
     exit $?
     ;;
   create)
-- 
2.17.1



_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel