Skip to Content.
Sympa Menu

perfsonar-dev - [pS-dev] [GEANT/SA2/SA2T3-OPPD] r746 - in branches/perfsonar-oppd-all-0.53: etc/oppd-dev lib/perfSONAR/Client tools/perfSONAR-client

Subject: perfsonar development work

List archive

[pS-dev] [GEANT/SA2/SA2T3-OPPD] r746 - in branches/perfsonar-oppd-all-0.53: etc/oppd-dev lib/perfSONAR/Client tools/perfSONAR-client


Chronological Thread 
  • From:
  • To:
  • Subject: [pS-dev] [GEANT/SA2/SA2T3-OPPD] r746 - in branches/perfsonar-oppd-all-0.53: etc/oppd-dev lib/perfSONAR/Client tools/perfSONAR-client
  • Date: Mon, 21 Nov 2011 09:25:27 +0000 (GMT)
Author: dfn.calim
Date: 2011-11-21 09:25:26 +0000 (Mon, 21 Nov 2011)
New Revision: 746

Modified:
branches/perfsonar-oppd-all-0.53/etc/oppd-dev/oppd.dev.conf
branches/perfsonar-oppd-all-0.53/lib/perfSONAR/Client/LS.pm
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/bwctl-test

branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/send_paralellel_echo.sh
Log:
add reregister after keepalive error

Modified: branches/perfsonar-oppd-all-0.53/etc/oppd-dev/oppd.dev.conf
===================================================================
--- branches/perfsonar-oppd-all-0.53/etc/oppd-dev/oppd.dev.conf 2011-11-10
15:16:31 UTC (rev 745)
+++ branches/perfsonar-oppd-all-0.53/etc/oppd-dev/oppd.dev.conf 2011-11-21
09:25:26 UTC (rev 746)
@@ -245,9 +245,7 @@
#
#ls_url
"http://ls.perfsonar.pionier.net.pl:8180/geant2-java-xml-ls/services/LookupService";
#ls_url "http://psmsu05.aglt2.org:9995/perfSONAR_PS/services/hLS";
-#ls_url "http://bby-e-sonar.sfu.ca:8095/perfSONAR_PS/services/hLS";
-#ls_url
"http://perfmonc.cesnet.cz:8070/XML-LS-1.1.2/services/LookupService";
-#ls_url
"http://ls.sonar.net.switch.ch:8180/XML-LS-1.1.1/services/LookupService";
+ls_url "http://ndb1.internet2.edu:9995/perfSONAR_PS/services/hLS";
ls_url "http://ps3.es.net:8095/perfSONAR_PS/services/hLS";

#

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/Client/LS.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/Client/LS.pm 2011-11-10
15:16:31 UTC (rev 745)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/Client/LS.pm 2011-11-21
09:25:26 UTC (rev 746)
@@ -100,13 +100,13 @@
$protocol = $modparam{$tool}{'protocol'};
$port = $modparam{$tool}{'port'};
create_register_message($service);
-
send_registration($messages{$service}{"register_msg"}, $service, $tool);
+
send_all_registration($messages{$service}{"register_msg"}, $service, $tool);
}
}

}else{
create_register_message($service);
- send_registration($messages{$service}{"register_msg"},
$service);
+ send_all_registration($messages{$service}{"register_msg"},
$service);
}
}
}
@@ -133,6 +133,16 @@
my $eventtype =
($response->{dom}->getElementsByTagNameNS("$nmwg",
"eventType"))[0]->textContent;
my $datumstring =
($response->{dom}->getElementsByTagNameNS("$nmwgr", "datum"))[0]->textContent;
$log->info("Keepalive for $service
returend $eventtype: $datumstring");
+
+ #sometimes LS is rebooted and
+ # LS key is lost of we get
+ # error for keepalive so try
+ #registration again
+ if ($eventtype =~ /error.ls/){
+ $log->warn("Error in
keepalive trying to reregister service to: $url");
+ my $re_reg_msg =
$reg_services->{$service}->{$url}->{LSREGMSG};
+
send_registration($re_reg_msg,$service,$url);
+ }
} else { #no response...
$log->errot("Sending keepalive for
$service: No response from Lookup Server!");
}
@@ -278,27 +288,15 @@
$message->add_attribute(parent => $paramnode, nodename => "parameter",
value => $key, name => "lsKey");
write_message($message, "keepalive");
return $message;
-}
+}

-sub send_registration {
-
- my $message = shift;
- my $service = shift;
- my $tool = "";
-
- if (@_){
- $tool = shift;
- }
-
- write_message($message, "register");
- foreach my $url (@ls_url){
- if ($tool){
- $log->info("registering service $service -> $tool to $url");
- }else{
- $log->info("registering service $service to $url");
- }
-
- my $response = perfSONAR::sendReceive(
+sub send_registration{
+
+ my $message = shift;
+ my $service = shift;
+ my $url = shift;
+
+ my $response = perfSONAR::sendReceive(
message => $message->clone,
uri => $url,
);
@@ -308,6 +306,7 @@
if ($key){
$reg_services->{$service}->{$url}->{LSKEY} = $key;
$reg_services->{$service}->{$url}->{KEEPALIVEMSG} =
create_keepalive_message($key);
+ $reg_services->{$service}->{$url}->{LSREGMSG} = $message->clone;
} else {
my $eventtype = ($response->{dom}->getElementsByTagNameNS("$nmwg",
"eventType"))[0]->textContent;
my $datumstring =
($response->{dom}->getElementsByTagNameNS("$nmwgr", "datum"))[0]->textContent;
@@ -317,7 +316,28 @@
#TODO should we delete this url
$log->error("error registering service $service: No response from
Lookup Server!");
}
+}
+
+sub send_all_registration {
+
+ my $message = shift;
+ my $service = shift;
+ my $tool = "";
+
+ if (@_){
+ $tool = shift;
}
+
+ write_message($message, "register");
+ foreach my $url (@ls_url){
+ if ($tool){
+ $log->info("registering service $service -> $tool to $url");
+ }else{
+ $log->info("registering service $service to $url");
+ }
+ #send message
+ send_registration($message,$service,$url);
+ }
}



Modified: branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/bwctl-test
===================================================================
--- branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/bwctl-test
2011-11-10 15:16:31 UTC (rev 745)
+++ branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/bwctl-test
2011-11-21 09:25:26 UTC (rev 746)
@@ -1 +1 @@
-./perfsonar-client.pl --reqfile=message.xml
--uri=http://calim.rrze.uni-erlangen.de:8090/services/MP/BWCTL
--host=calim.rrze.uni-erlangen.de --port=80900
+./perfsonar-client.pl --reqfile=$1
--uri=http://genesis-vm-centos5-32.rrze.uni-erlangen.de:8090/services/MP/BWCTL
--host=genesis-vm-centos5-32.rrze.uni-erlangen.de --port=8090

Modified:
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/send_paralellel_echo.sh
===================================================================
---
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/send_paralellel_echo.sh
2011-11-10 15:16:31 UTC (rev 745)
+++
branches/perfsonar-oppd-all-0.53/tools/perfSONAR-client/send_paralellel_echo.sh
2011-11-21 09:25:26 UTC (rev 746)
@@ -1,7 +1,7 @@
#!/bin/bash
-for i in {10..40}
+for i in {10..50}
do
OUTFILE="$i.txt"
- ./bwctl-test-calim ../../lib/NMWG/examples/2.0/EchoRequest.xml >
$OUTFILE &
+ ./bwctl-test ../../lib/NMWG/examples/2.0/EchoRequest.xml > $OUTFILE &
done



  • [pS-dev] [GEANT/SA2/SA2T3-OPPD] r746 - in branches/perfsonar-oppd-all-0.53: etc/oppd-dev lib/perfSONAR/Client tools/perfSONAR-client, svn-noreply, 11/21/2011

Archive powered by MHonArc 2.6.16.

Top of Page