Commit 5ed60c85 authored by Leigh Stoller's avatar Leigh Stoller

Never ever load libtblog in a library, load libtblog_simple and let the

including program decide to include it. Also get rid of tblog session
stuff in a couple of libraries, just broken stuff.
parent 1e69a525
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -37,7 +37,7 @@ use vars qw(@ISA @EXPORT);
use libtestbed; # for TBGenSecretKey();
use libdb;
use libreboot;
use libtblog;
use libtblog_simple;
use Node;
use NodeType;
use OSImage;
......@@ -154,14 +154,6 @@ sub osload ($$) {
%nodeflags = %{$args->{'nodeflags'}};
}
#
# Start a new logging sub-process
#
my $old_env = \%ENV;
local %ENV;
copy_hash %ENV, $old_env;
tblog_sub_process("osload", @nodes);
#
# Figure out who called us. Root and admin types can do whatever they
# want. Normal users can only change nodes in experiments in their
......
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -37,7 +37,7 @@ use base qw( Exporter );
use libtestbed; # for TBGenSecretKey();
use libdb;
use libreboot;
use libtblog;
use libtblog_simple;
use Node;
use NodeType;
use Interface;
......@@ -495,16 +495,6 @@ sub osload($$$) {
$self->{FLAGS} = \%flags;
if (!$self->debug() || $flags{asyncmode}) {
#
# Start a new logging sub-process
#
my $old_env = \%ENV;
local %ENV;
copy_hash %ENV, $old_env;
tblog_sub_process("osload", @nodes);
}
#
# Figure out who called us. Root and admin types can do whatever they
# want. Normal users can only change nodes in experiments in their
......@@ -1790,7 +1780,7 @@ use base qw(libosload_new);
use libtestbed;
use libdb;
use libtblog;
use libtblog_simple;
use Node;
use OSImage;
use English;
......@@ -2468,7 +2458,7 @@ use base qw(libosload_common);
use libtestbed;
use libdb;
use libtblog;
use libtblog_simple;
use Node;
use OSImage;
use English;
......@@ -2641,7 +2631,7 @@ use base qw(libosload_pc);
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -2652,7 +2642,7 @@ use base qw(libosload_pc);
use libtestbed;
use libdb;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -2731,7 +2721,7 @@ use base qw(libosload_virtnode);
use libdb;
use libtestbed;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -2752,7 +2742,7 @@ use base qw(libosload_common);
use libtestbed;
use libdb;
use libtblog;
use libtblog_simple;
use Node;
use OSImage;
use English;
......
......@@ -9,7 +9,7 @@ use vars qw($AUTOLOAD);
use libdb;
use libtestbed;
use libtblog;
use libtblog_simple;
use libreboot;
use Node;
use Group;
......
#!/usr/bin/perl -wT
#
# Copyright (c) 2016 University of Utah and the Flux Group.
# Copyright (c) 2016, 2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -33,7 +33,7 @@ use vars qw($AUTOLOAD);
use libtestbed;
use libdb;
use libtblog;
use libtblog_simple;
use Node;
use OSImage;
use English;
......
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -43,7 +43,7 @@ use libosload;
use OSImage;
use Node;
use NodeType;
use libtblog;
use libtblog_simple;
use Logfile;
use English;
use Data::Dumper;
......@@ -1033,7 +1033,7 @@ use base qw(libossetup);
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -1193,7 +1193,7 @@ use base qw(libossetup_handler);
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -1527,7 +1527,7 @@ use base qw(libossetup_pc);
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -1545,7 +1545,7 @@ use libdb;
use libtestbed;
use libossetup;
use libosload;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -1921,7 +1921,7 @@ use base qw(libossetup_virtnode);
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -1955,7 +1955,7 @@ use base qw(libossetup_handler);
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -2003,7 +2003,7 @@ my $PGENISUPPORT= @PROTOGENI_SUPPORT@;
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -2143,7 +2143,7 @@ use base qw(libossetup_virtnode);
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -2176,7 +2176,7 @@ use base qw(libossetup_virtnode);
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......@@ -2211,7 +2211,7 @@ use base qw(libossetup_pc);
use libdb;
use libtestbed;
use libossetup;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......
#!/usr/bin/perl -w
#
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# Copyright (c) 2000-2010, 2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -39,7 +39,7 @@ use libossetup;
# XXX only works with newer version of libosload!
use libosload_new;
use libosload_switch;
use libtblog;
use libtblog_simple;
use Node;
use English;
use Data::Dumper;
......
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2017 University of Utah and the Flux Group.
# Copyright (c) 2000-2018 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -40,7 +40,7 @@ use vars qw(@ISA @EXPORT);
# Must come after package declaration!
use lib '@prefix@/lib';
use libdb;
use libtblog;
use libtblog_simple;
use English;
#
......@@ -142,14 +142,6 @@ sub nodereboot($$)
my @nodes = @{ $args->{'nodelist'}};
my %nodeobjects = (); # Not in the mood to rewrite this function.
#
# Start a new logging sub-process
#
my $old_env = \%ENV;
local %ENV;
copy_hash %ENV, $old_env;
tblog_sub_process("reboot", @nodes);
# Reset our few globals.
$debug = 0;
$silent = 0;
......@@ -632,14 +624,6 @@ sub RebootNode {
my ($status, $syspid, $mypid, $nodestate);
my $pc = $nodeobject->node_id();
#
# Start a new logging sub-process
#
my $old_env = \%ENV;
local %ENV;
copy_hash %ENV, $old_env;
tblog_sub_process("reboot_node", $pc);
if ($reconfig) {
print "reboot ($pc): Attempting to reconfigure ...\n"
if (!$silent);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment