Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
112d4dce
Commit
112d4dce
authored
Sep 30, 2009
by
Leigh B. Stoller
Browse files
Kill obsolete tmcd_redirect code.
parent
af35e75d
Changes
1
Hide whitespace changes
Inline
Side-by-side
protogeni/lib/GeniSliver.pm.in
View file @
112d4dce
...
...
@@ -25,6 +25,7 @@ use GeniUsage;
use
emutil
qw
(
TBGetUniqueIndex
);
use
Experiment
;
use
OSinfo
;
use
Node
;
use
English
;
use
XML
::
Simple
;
use
Data
::
Dumper
;
...
...
@@ -609,25 +610,6 @@ sub Provision($;$)
my
$
pid
=
$
experiment
->
pid
();
my
$
eid
=
$
experiment
->
eid
();
my
$
redirected
=
0
;
if
(
exists
($
self
->
rspec
()->{
'tmcd_server'
})
&&
exists
($
self
->
rspec
()->{
'tmcd_nodeid'
}))
{
my
$
tmcd_redirect
=
$
self
->
rspec
()->{
'tmcd_server'
}
.
":"
.
$
self
->
rspec
()->{
'tmcd_nodeid'
};
if
($
node
->
ModifyReservation
({
"tmcd_redirect"
=>
$
tmcd_redirect
})){
return
-
1
;
}
$
redirected
=
1
;
}
#
#
An
emulab
cluster
node
uses
a
vnode
on
the
physnode
,
even
for
a
#
dedicated
physical
nodes
.
We
need
to
tell
tmcd
about
the
pnode
,
#
but
not
the
vnode
since
it
is
going
to
redirect
to
tmcd
on
the
#
remote
Emulab
controlling
the
experiment
.
#
if
(
!$node->isremotenode() &&
exists
($
self
->
rspec
()->{
'virtualization_type'
})
&&
$
self
->
rspec
()->{
'virtualization_type'
}
eq
"emulab-vnode"
)
{
...
...
@@ -637,9 +619,8 @@ sub Provision($;$)
return
-
1
;
}
#
Not
redirected
.
Use
local
tmcd
anyway
.
$
node
->
ModifyReservation
({
"genisliver_idx"
=>
$
self
->
idx
()})
if
(
!$redirected);
#
Mark
$
node
->
ModifyReservation
({
"genisliver_idx"
=>
$
self
->
idx
()});
if
(
exists
($
self
->
rspec
()->{
'virtualization_subtype'
}))
{
my
$
subtype
=
$
self
->
rspec
()->{
'virtualization_subtype'
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment