Merge "Bosh packaging update for multiple versions of redis"

cloudfoundry-attic · Oct 23, 2012 · 49b1e26 · 49b1e26
2 parents 4e88614 + dd1ea91
commit 49b1e26
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 15 deletions.
diff --git a/config/blobs.yml b/config/blobs.yml
@@ -571,6 +571,10 @@ redis/redis-2.2.15.tar.gz:
   object_id: eyJvaWQiOiI0ZTRlNzhiY2EzMWUxMjEwMDRlNGU3ZDUxNDc0NWYwNGZmZjRh%0AZjYxYjY5ZSIsInNpZyI6InA3Mkl4MVBKYWdGZnNYb0xjcGlDczY1QnJKRT0i%0AfQ==%0A
   sha: aa6758590363556e73f8d36bdfccb429011da331
   size: 456185
+redis/redis-2.4.17.tar.gz:
+  object_id: eyJvaWQiOiI0ZTRlNzhiY2ExMWUxMjIyMDRlNGU5ODYzOGI3NjMwNTA3ODc2%0ANDFhMDQ3NCIsInNpZyI6IkgxVGtzZUVzdnJUT0kxMTBsU1ZTTkUveU5icz0i%0AfQ==%0A
+  sha: 3d540531b3d7103a511d29661c2ae666dac60522
+  size: 656155
 hadoop/hadoop-0.20.2-cdh3u4.tar.gz:
   object_id: eyJvaWQiOiI0ZTRlNzhiY2E1MWUxMjIyMDRlNGU5ODYzZjI4ZjMwNGZiZDAx%0AODQwN2YwYiIsInNpZyI6ImtrWDA3SXVFVzNiTmNPSHhqMGNhd0Nmb2I0RT0i%0AfQ==%0A
   sha: 1a9e6437b4b7f0bdbfdd3bd9170a33238e151f12

diff --git a/jobs/redis_node/spec b/jobs/redis_node/spec
@@ -18,7 +18,8 @@ templates:
 packages:
   - common
   - redis_node
-  - redis
+  - redis22
+  - redis24
   - ruby
   - sqlite
   - syslog_aggregator
diff --git a/jobs/redis_node/templates/redis_node.yml.erb b/jobs/redis_node/templates/redis_node.yml.erb
@@ -5,8 +5,11 @@ plan_enabled = properties.service_plans && properties.service_plans.send(service
 plan = properties.plan || "free"
 plan_conf = plan_enabled && properties.service_plans.send(service.to_sym).send(plan.to_sym).configuration
 node = properties.redis_node
-supported_versions = node.supported_versions
+supported_versions = node.supported_versions || ["2.2"]
 default_version = node.default_version
+packages = {}
+# convention, package contains redis 2.2 is redis22
+supported_versions.each{|v| packages[v] = v.sub(".","")}
 %>
 capacity: <%= plan_enabled && plan_conf.capacity || 200 %>
 plan: <%= plan %>
@@ -28,7 +31,10 @@ default_version: <%= "'#{default_version}'"%>
 max_memory: <%= plan_enabled && plan_conf.max_memory || 16 %>
 max_swap: <%= plan_enabled && plan_conf.max_swap || 32 %>
 max_clients: <%= plan_enabled && plan_conf.max_clients || 500 %>
-redis_server_path: /var/vcap/packages/redis/bin/redis-server
+redis_server_path:
+<% for version in supported_versions %>
+  <%= "'#{version}': /var/vcap/packages/redis#{packages[version]}/bin/redis-server" %>
+<% end %>
 port_range:
   first: 5000
   last: 25000

diff --git a/jobs/redis_node/templates/redis_worker.yml.erb b/jobs/redis_node/templates/redis_worker.yml.erb
@@ -5,6 +5,10 @@ plan_enabled = properties.service_plans && properties.service_plans.send(service
 plan = properties.plan || "free"
 plan_conf = plan_enabled && properties.service_plans.send(service.to_sym).send(plan.to_sym).configuration
 lifecycle = properties.service_lifecycle
+supported_versions = properties.redis_node.supported_versions || ["2.2"]
+packages = {}
+# convention, package contains redis 2.2 is redis22
+supported_versions.each{|v| packages[v] = v.sub(".","")}
 %>
 <% if lifecycle and lifecycle.resque %>
 <% snapshot_dir = lifecycle.mount_point || "/var/vcap/services_snapshot" %>
@@ -35,5 +39,8 @@ serialization:
 # addtional options
 command_rename_prefix: <%= properties.redis_node.command_rename_prefix || "magic-protect-command-prefix" %>
 gzip_bin: /bin/gzip
-redis_server_path: /var/vcap/packages/redis/bin/redis-server
+redis_server_path:
+<% for version in supported_versions %>
+  <%= "'#{version}': /var/vcap/packages/redis#{packages[version]}/bin/redis-server" %>
+<% end %>
 <% end %>
diff --git a/jobs/redis_node_ng/spec b/jobs/redis_node_ng/spec
@@ -23,7 +23,8 @@ templates:
 packages:
   - common
   - redis_node_ng
-  - redis
+  - redis22
+  - redis24
   - ruby
   - sqlite
   - syslog_aggregator
diff --git a/jobs/redis_node_ng/templates/redis_node.yml.erb b/jobs/redis_node_ng/templates/redis_node.yml.erb
@@ -24,12 +24,10 @@ pid: /var/vcap/sys/run/redis_node/redis_node.pid
 node_id: <%= "#{service}_node#{'_' + plan if plan != 'free'}_#{spec.index.to_i + 1}" %>
 supported_versions: <%= "['#{supported_versions.join("' , '")}']" %>
 default_version: <%= "'#{default_version}'"%>
-
 max_memory: <%= plan_enabled && plan_conf.max_memory || 16 %>
 memory_overhead: <%= plan_enabled && plan_conf.memory_overhead || 20 %>
 max_swap: <%= plan_enabled && plan_conf.max_swap || 32 %>
 max_clients: <%= plan_enabled && plan_conf.max_clients || 500 %>
-redis_server_path: /var/vcap/packages/redis/bin/redis-server
 port_range:
   first: 5000
   last: 25000

diff --git a/jobs/redis_node_ng/templates/redis_startup.sh b/jobs/redis_node_ng/templates/redis_startup.sh
@@ -5,4 +5,8 @@ for n in `seq 1 100`; do
   sleep 0.1
 done
 
-exec start-stop-daemon --start --quiet --chuid vcap --exec  /usr/bin/redis-server /store/instance/redis.conf
+# redis_startup.sh 2.2 - start redis 2.2.x
+# redis_startup.sh 2.4 - start redis 2.4.x
+version=$1
+shift
+exec start-stop-daemon --start --quiet --chuid vcap --exec  /usr/share/redis/redis-$version/redis-server /store/instance/redis.conf
diff --git a/jobs/redis_node_ng/templates/redis_worker.yml.erb b/jobs/redis_node_ng/templates/redis_worker.yml.erb
@@ -5,6 +5,12 @@ plan_enabled = properties.service_plans && properties.service_plans.send(service
 plan = properties.plan || "free"
 plan_conf = plan_enabled && properties.service_plans.send(service.to_sym).send(plan.to_sym).configuration
 lifecycle = properties.service_lifecycle
+
+supported_versions = properties.redis_node.supported_versions || ["2.2"]
+
+packages = {}
+# convention, package contains redis 2.2 is redis22
+supported_versions.each{|v| packages[v] = v.sub(".","")}
 %>
 <% if lifecycle and lifecycle.resque %>
 <% snapshot_dir = lifecycle.mount_point || "/var/vcap/services_snapshot" %>
@@ -36,7 +42,11 @@ serialization:
 command_rename_prefix: <%= properties.redis_node.command_rename_prefix || "magic-protect-command-prefix" %>
 gzip_bin: /bin/gzip
 redis_log_dir: /var/vcap/sys/service-log/redis
-redis_server_path: /var/vcap/packages/redis/bin/redis-server
+redis_server_path:
++<% for version in supported_versions %>
++  <%= "'#{version}': /var/vcap/packages/redis#{packages[version]}/bin/redis-server" %>
++<% end %>
+
 image_dir: /var/vcap/store/redis_image
 max_disk: <%= plan_enabled && plan_conf.max_disk || 128 %>
 <% end %>
diff --git a/jobs/redis_node_ng/templates/warden_ctl b/jobs/redis_node_ng/templates/warden_ctl
@@ -2,7 +2,9 @@
 
 JOB_DIR=/var/vcap/jobs/redis_node_ng
 PKG_DIR=/var/vcap/packages/redis_node_ng
-BIN_DIR=/var/vcap/packages/redis/bin
+
+REDIS22_BIN_DIR=/var/vcap/packages/redis22/bin
+REDIS24_BIN_DIR=/var/vcap/packages/redis24/bin
 
 source /var/vcap/packages/redis_node_ng/common/services/utils.sh
 
@@ -11,8 +13,13 @@ case $1 in
   start)
     setup_warden
 
+    mkdir -p $ROOT_DIR/usr/share/redis/redis-2.2
+    mkdir -p $ROOT_DIR/usr/share/redis/redis-2.4
+
     # Copy redis binaries and configuration files to warden base file system
-    install -m 0755 -t $ROOT_DIR/usr/bin  $JOB_DIR/bin/redis_startup.sh $BIN_DIR/*
+    install -m 0755 -t $ROOT_DIR/usr/bin  $JOB_DIR/bin/redis_startup.sh
+    install -m 0755 -t $ROOT_DIR/usr/share/redis/redis-2.2 $REDIS22_BIN_DIR/*
+    install -m 0755 -t $ROOT_DIR/usr/share/redis/redis-2.4 $REDIS24_BIN_DIR/*
     install -m 0644 -t $ROOT_DIR/etc/init $JOB_DIR/config/services.conf
 
     start_warden

diff --git a/jobs/vcap_redis/spec b/jobs/vcap_redis/spec
@@ -7,4 +7,4 @@ templates:
 
 packages:
   - common
-  - redis
+  - redis22
diff --git a/jobs/vcap_redis/templates/vcap_redis_ctl b/jobs/vcap_redis/templates/vcap_redis_ctl
@@ -5,6 +5,11 @@ LOG_DIR=/var/vcap/sys/log/vcap_redis
 <% if properties.vcap_redis.persistence %>
 PERSISTENCE_DIR=<%= properties.vcap_redis.persistence.dir || "/vcar/vcap/store/vcap_redis/" %>
 <% end %>
+
+<%
+  redis_version = properties.vcap_redis.redis_version || "2.2"
+%>
+REDIS_INSTALL_DIR=/var/vcap/packages/redis<%= redis_version.sub(".", "") %>
 PIDFILE=$RUN_DIR/vcap_redis.pid
 
 source /var/vcap/packages/common/utils.sh
@@ -23,7 +28,7 @@ case $1 in
     <% end %>
     echo $$ > $PIDFILE
 
-    exec /var/vcap/packages/redis/bin/redis-server /var/vcap/jobs/vcap_redis/config/vcap_redis.conf
+    exec $REDIS_INSTALL_DIR/bin/redis-server /var/vcap/jobs/vcap_redis/config/vcap_redis.conf
 
     ;;
 

diff --git a/packages/redis/packaging → packages/redis22/packaging b/packages/redis/packaging → packages/redis22/packaging
diff --git a/packages/redis/spec → packages/redis22/spec b/packages/redis/spec → packages/redis22/spec
@@ -1,4 +1,4 @@
 ---
-name: redis
+name: redis22
 files:
 - redis/redis-2.2.15.tar.gz
diff --git a/packages/redis24/packaging b/packages/redis24/packaging
@@ -0,0 +1,10 @@
+# abort script on any command that exit with a non zero value
+set -e
+
+tar zxf redis/redis-2.4.17.tar.gz
+
+(
+  cd redis-2.4.17
+  make
+  make PREFIX=$BOSH_INSTALL_TARGET install
+)
diff --git a/packages/redis24/spec b/packages/redis24/spec
@@ -0,0 +1,4 @@
+---
+name: redis24
+files:
+- redis/redis-2.4.17.tar.gz
diff --git a/src/services b/src/services