jordi - in flumotion-flowtester/trunk: . data/flows/http-server
data/flows/http-server_with_rate_control
flumotion-commit at lists.fluendo.com
flumotion-commit at lists.fluendo.com
Thu Apr 24 17:03:26 CEST 2008
Author: jordi
Date: Thu Apr 24 17:03:26 2008
New Revision: 6549
Log:
* data/flows/http-server/planet.ini:
* data/flows/http-server/planet.xml:
* data/flows/http-server_with_rate_control/epilogue.sh:
* data/flows/http-server_with_rate_control/planet.ini:
* data/flows/http-server_with_rate_control/planet.xml:
* data/flows/http-server_with_rate_control/prologue.sh:
Try the http-server tests looking at the cpu load usage.
Added:
flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/
flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/epilogue.sh (contents, props changed)
flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/planet.ini (contents, props changed)
flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/planet.xml (contents, props changed)
flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/prologue.sh (contents, props changed)
Modified:
flumotion-flowtester/trunk/ChangeLog
flumotion-flowtester/trunk/data/flows/http-server/planet.ini
flumotion-flowtester/trunk/data/flows/http-server/planet.xml
Modified: flumotion-flowtester/trunk/ChangeLog
==============================================================================
--- flumotion-flowtester/trunk/ChangeLog (original)
+++ flumotion-flowtester/trunk/ChangeLog Thu Apr 24 17:03:26 2008
@@ -1,5 +1,15 @@
2008-04-24 Jordi Massaguer i Pla <jordi at flumotion.com>
+ * data/flows/http-server/planet.ini:
+ * data/flows/http-server/planet.xml:
+ * data/flows/http-server_with_rate_control/epilogue.sh:
+ * data/flows/http-server_with_rate_control/planet.ini:
+ * data/flows/http-server_with_rate_control/planet.xml:
+ * data/flows/http-server_with_rate_control/prologue.sh:
+ Try the http-server tests looking at the cpu load usage.
+
+2008-04-24 Jordi Massaguer i Pla <jordi at flumotion.com>
+
* data/flows/http-server_with_rate_control/planet.ini:
* data/flows/http-server_with_rate_control/planet.xml:
* data/flows/http-server_with_rate_control/epilogue.sh:
Modified: flumotion-flowtester/trunk/data/flows/http-server/planet.ini
==============================================================================
--- flumotion-flowtester/trunk/data/flows/http-server/planet.ini (original)
+++ flumotion-flowtester/trunk/data/flows/http-server/planet.ini Thu Apr 24 17:03:26 2008
@@ -1,7 +1,7 @@
[flow]
epilogue=epilogue.sh
history=FAIL Tue Dec 12 11:00:17 2006,PASS Wed Jan 10 17:05:53 2007,PASS Tue Jan 16 12:32:49 2007,PASS Thu Mar 22 12:19:45 2007,PASS Mon Apr 2 11:34:22 2007,PASS Mon May 28 16:08:21 2007,PASS Fri Jun 8 14:24:11 2007,PASS Thu Apr 3 16:58:42 2008,PASS Mon Apr 7 19:04:26 2008,PASS Thu Apr 10 19:33:01 2008,PASS Mon Apr 14 11:43:29 2008
-name=http server rate control test
-notes=Try to download the linked URL and check that the download rate does not exceed the configured one in the rate control
+name=http server simple test
+notes=Try to download the linked URL. Then ensure it got logged in /tmp/test-apache.log. The file should be 800 kB (800*1024) in length, and is full of zeroes so it's not very interesting.\n\nResults: file downloads fine, and there is an apache log.
prologue=prologue.sh
-urls=http://%(worker3)s:8900/test/test.raw
+urls=http://%(worker3)s:8901/test/test.raw
Modified: flumotion-flowtester/trunk/data/flows/http-server/planet.xml
==============================================================================
--- flumotion-flowtester/trunk/data/flows/http-server/planet.xml (original)
+++ flumotion-flowtester/trunk/data/flows/http-server/planet.xml Thu Apr 24 17:03:26 2008
@@ -3,18 +3,13 @@
<flow name="default">
<component name="http-server" project="flumotion" type="http-server" version="0.3.1.1" worker="worker3">
<property name="mount-point">/test</property>
- <property name="port">8900</property>
+ <property name="port">8901</property>
<property name="path">/tmp</property>
<plugs>
<plug socket="flumotion.component.plugs.loggers.Logger"
type="apachelogger">
<property name="logfile">/tmp/test-apache.log</property>
</plug>
- <plug socket="flumotion.component.misc.httpserver.ratecontroller.RateController" type="fixed-rate-plug">
- <property name="rate">200</property>
- <property name="max-level">200</property>
- <property name="initial-level">200</property>
- </plug>
</plugs>
</component>
</flow>
Added: flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/epilogue.sh
==============================================================================
--- (empty file)
+++ flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/epilogue.sh Thu Apr 24 17:03:26 2008
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+
+manager=$1
+worker1=$2
+worker2=$3
+worker3=$4
+
+if test -n "$worker1"; then
+SSH=ssh
+else
+SSH=
+fi
+
+# delete the created file
+$SSH $worker3 rm /tmp/file.raw
+# and the log file
+$SSH $worker3 rm /tmp/test-apache.log
+
Added: flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/planet.ini
==============================================================================
--- (empty file)
+++ flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/planet.ini Thu Apr 24 17:03:26 2008
@@ -0,0 +1,7 @@
+[flow]
+epilogue=epilogue.sh
+history=FAIL Tue Dec 12 11:00:17 2006,PASS Wed Jan 10 17:05:53 2007,PASS Tue Jan 16 12:32:49 2007,PASS Thu Mar 22 12:19:45 2007,PASS Mon Apr 2 11:34:22 2007,PASS Mon May 28 16:08:21 2007,PASS Fri Jun 8 14:24:11 2007,PASS Thu Apr 3 16:58:42 2008,PASS Mon Apr 7 19:04:26 2008,PASS Thu Apr 10 19:33:01 2008,PASS Mon Apr 14 11:43:29 2008,PASS Thu Apr 24 16:17:43 2008,PASS Thu Apr 24 16:35:39 2008
+name=http server rate control test
+notes=Try to download the linked URL with some command line tool like "wget URL" and check that the download rate does not exceed the configured one in the rate control. \n\nBe careful on the units. "wget" may give to you the "Bytes per second" and the flow file units are "bits per second."\n\nCheck also that the cpu load is low for the http-server component. For measuring that, compare it to the previous test.
+prologue=prologue.sh
+urls=http://%(worker3)s:8900/test/test.raw
Added: flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/planet.xml
==============================================================================
--- (empty file)
+++ flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/planet.xml Thu Apr 24 17:03:26 2008
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<planet>
+ <flow name="default">
+ <component name="http-server" project="flumotion" type="http-server" version="0.3.1.1" worker="worker3">
+ <property name="mount-point">/test</property>
+ <property name="port">8900</property>
+ <property name="path">/tmp</property>
+ <plugs>
+ <plug socket="flumotion.component.plugs.loggers.Logger"
+ type="apachelogger">
+ <property name="logfile">/tmp/test-apache.log</property>
+ </plug>
+ <plug socket="flumotion.component.misc.httpserver.ratecontroller.RateController" type="fixed-rate-plug">
+ <property name="rate">200</property>
+ <property name="max-level">200</property>
+ <property name="initial-level">200</property>
+ </plug>
+ </plugs>
+ </component>
+ </flow>
+</planet>
Added: flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/prologue.sh
==============================================================================
--- (empty file)
+++ flumotion-flowtester/trunk/data/flows/http-server_with_rate_control/prologue.sh Thu Apr 24 17:03:26 2008
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+manager=$1
+worker1=$2
+worker2=$3
+worker3=$4
+
+if test -n "$worker1"; then
+SSH=ssh
+else
+SSH=
+fi
+
+# create an 800 kB file
+$SSH $worker3 dd if=/dev/zero of=/tmp/test.raw bs=4096 count=200
+
More information about the flumotion-commit
mailing list