Author: arkurth
Date: Mon Jul 18 16:23:39 2011
New Revision: 1147951
URL: http://svn.apache.org/viewvc?rev=1147951&view=rev
Log:
VCL-428
Added code to vcld to clear the %ENV keys for each reservation:
database_select_count, database_execute_count, and database_select_calls.
Without clearing them, forked state processes inherit the value from vcld.
Modified:
incubator/vcl/trunk/managementnode/bin/vcld
Modified: incubator/vcl/trunk/managementnode/bin/vcld
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/bin/vcld?rev=1147951&r1=1147950&r2=1147951&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/bin/vcld (original)
+++ incubator/vcl/trunk/managementnode/bin/vcld Mon Jul 18 16:23:39 2011
@@ -197,9 +197,13 @@ sub main () {
my $request_end =
$info{request}{$request_id}{end};
my $request_preload =
$info{request}{$request_id}{preload};
- $ENV{request_id} = $request_id;
- $ENV{reservation_id} = 0;
- $ENV{state} = $request_state_name;
+ $ENV{request_id} = $request_id;
+ $ENV{reservation_id} = 0;
+ $ENV{state} = $request_state_name;
+
+ $ENV{database_select_count} = 0;
+ $ENV{database_execute_count} = 0;
+ $ENV{database_select_calls} = {};
# Make sure the request state is valid
if ($request_state_name !~
/inuse|reserved|deleted|timeout|reclaim|reload|new|tomaintenance|image|imageprep|makeproduction|imageinuse|complete|failed|pending|maintenance|tovmhostinuse|rebootsoft|reboothard|reinstall/)
{
