Skip to content
GitLab
Menu
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
41bfeaeb
Commit
41bfeaeb
authored
Jan 26, 2015
by
Mike Hibler
Browse files
All the server-side goo to support a new BSTORE event type.
parent
e8de812f
Changes
7
Hide whitespace changes
Inline
Side-by-side
clientside/lib/libtb/tbdefs.c
View file @
41bfeaeb
/*
* Copyright (c) 2000-20
06, 2012
University of Utah and the Flux Group.
* Copyright (c) 2000-20
15
University of Utah and the Flux Group.
*
* {{{EMULAB-LICENSE
*
...
...
@@ -50,6 +50,7 @@ char *tbdb_objecttypes[] = {
TBDB_OBJECTTYPE_EVPROXY
,
TBDB_OBJECTTYPE_BGMON
,
TBDB_OBJECTTYPE_DISK
,
TBDB_OBJECTTYPE_BSTORE
,
/*
* NOTE: Add the object type and any events that send back COMPLETEs to
* the objtype2complete array in event-sched.c:sends_complete().
...
...
clientside/lib/libtb/tbdefs.h
View file @
41bfeaeb
...
...
@@ -50,31 +50,32 @@
*
* If you add to these two lists, make sure you add to the arrays in tbdefs.c
*/
#define TBDB_OBJECTTYPE_TESTBED "TBCONTROL"
#define TBDB_OBJECTTYPE_STATE "TBNODESTATE"
#define TBDB_OBJECTTYPE_OPMODE "TBNODEOPMODE"
#define TBDB_OBJECTTYPE_EXPTSTATE "TBEXPTSTATE"
#define TBDB_OBJECTTYPE_LINK "LINK"
#define TBDB_OBJECTTYPE_TRAFGEN "TRAFGEN"
#define TBDB_OBJECTTYPE_TIME "TIME"
#define TBDB_OBJECTTYPE_PROGRAM "PROGRAM"
#define TBDB_OBJECTTYPE_FRISBEE "FRISBEE"
#define TBDB_OBJECTTYPE_SIMULATOR "SIMULATOR"
#define TBDB_OBJECTTYPE_LINKTEST "LINKTEST"
#define TBDB_OBJECTTYPE_NSE
"NSE"
#define TBDB_OBJECTTYPE_CANARYD "CANARYD"
#define TBDB_OBJECTTYPE_NODE
"NODE"
#define TBDB_OBJECTTYPE_GROUP
"GROUP"
#define TBDB_OBJECTTYPE_TIMELINE "TIMELINE"
#define TBDB_OBJECTTYPE_SEQUENCE "SEQUENCE"
#define TBDB_OBJECTTYPE_CONSOLE "CONSOLE"
#define TBDB_OBJECTTYPE_TESTBED
"TBCONTROL"
#define TBDB_OBJECTTYPE_STATE
"TBNODESTATE"
#define TBDB_OBJECTTYPE_OPMODE
"TBNODEOPMODE"
#define TBDB_OBJECTTYPE_EXPTSTATE
"TBEXPTSTATE"
#define TBDB_OBJECTTYPE_LINK
"LINK"
#define TBDB_OBJECTTYPE_TRAFGEN
"TRAFGEN"
#define TBDB_OBJECTTYPE_TIME
"TIME"
#define TBDB_OBJECTTYPE_PROGRAM
"PROGRAM"
#define TBDB_OBJECTTYPE_FRISBEE
"FRISBEE"
#define TBDB_OBJECTTYPE_SIMULATOR
"SIMULATOR"
#define TBDB_OBJECTTYPE_LINKTEST
"LINKTEST"
#define TBDB_OBJECTTYPE_NSE
"NSE"
#define TBDB_OBJECTTYPE_CANARYD
"CANARYD"
#define TBDB_OBJECTTYPE_NODE
"NODE"
#define TBDB_OBJECTTYPE_GROUP
"GROUP"
#define TBDB_OBJECTTYPE_TIMELINE
"TIMELINE"
#define TBDB_OBJECTTYPE_SEQUENCE
"SEQUENCE"
#define TBDB_OBJECTTYPE_CONSOLE
"CONSOLE"
#define TBDB_OBJECTTYPE_TOPOGRAPHY "TOPOGRAPHY"
#define TBDB_OBJECTTYPE_LINKTRACE "LINKTRACE"
#define TBDB_OBJECTTYPE_EVPROXY "EVPROXY"
#define TBDB_OBJECTTYPE_BGMON "BGMON"
#define TBDB_OBJECTTYPE_DISK "DISK"
#define TBDB_OBJECTTYPE_CUSTOM "CUSTOM"
#define TBDB_OBJECTTYPE_PLABSCHED "PLABSCHED"
#define TBDB_OBJECTTYPE_LINKTRACE "LINKTRACE"
#define TBDB_OBJECTTYPE_EVPROXY "EVPROXY"
#define TBDB_OBJECTTYPE_BGMON "BGMON"
#define TBDB_OBJECTTYPE_DISK "DISK"
#define TBDB_OBJECTTYPE_CUSTOM "CUSTOM"
#define TBDB_OBJECTTYPE_PLABSCHED "PLABSCHED"
#define TBDB_OBJECTTYPE_BSTORE "BSTORE"
#define TBDB_EVENTTYPE_START "START"
#define TBDB_EVENTTYPE_STOP "STOP"
...
...
event/new_sched/event-sched.c
View file @
41bfeaeb
/*
* Copyright (c) 2000-201
1
University of Utah and the Flux Group.
* Copyright (c) 2000-201
5
University of Utah and the Flux Group.
*
* {{{EMULAB-LICENSE
*
...
...
@@ -652,6 +652,9 @@ int sends_complete(struct agent *agent, const char *evtype)
{
TBDB_OBJECTTYPE_LINKTRACE
,
linktrace_completes
},
{
TBDB_OBJECTTYPE_EVPROXY
,
NULL
},
{
TBDB_OBJECTTYPE_BGMON
,
NULL
},
{
TBDB_OBJECTTYPE_DISK
,
NULL
},
{
TBDB_OBJECTTYPE_CUSTOM
,
NULL
},
{
TBDB_OBJECTTYPE_BSTORE
,
NULL
},
{
NULL
,
NULL
}
};
...
...
event/sched/event-sched.c
View file @
41bfeaeb
/*
* Copyright (c) 2000-201
2
University of Utah and the Flux Group.
* Copyright (c) 2000-201
5
University of Utah and the Flux Group.
*
* {{{EMULAB-LICENSE
*
...
...
@@ -654,6 +654,7 @@ int sends_complete(struct agent *agent, const char *evtype)
{
TBDB_OBJECTTYPE_BGMON
,
NULL
},
{
TBDB_OBJECTTYPE_DISK
,
NULL
},
{
TBDB_OBJECTTYPE_CUSTOM
,
NULL
},
{
TBDB_OBJECTTYPE_BSTORE
,
NULL
},
{
NULL
,
NULL
}
};
...
...
sql/database-fill.sql
View file @
41bfeaeb
...
...
@@ -170,6 +170,7 @@ REPLACE INTO event_objecttypes VALUES (16,'EVPROXY');
REPLACE
INTO
event_objecttypes
VALUES
(
17
,
'BGMON'
);
REPLACE
INTO
event_objecttypes
VALUES
(
18
,
'DISK'
);
REPLACE
INTO
event_objecttypes
VALUES
(
19
,
'CUSTOM'
);
REPLACE
INTO
event_objecttypes
VALUES
(
20
,
'BSTORE'
);
--
-- Dumping data for table `exported_tables`
...
...
sql/updates/4/425
0 → 100644
View file @
41bfeaeb
#
# Blockstore event type
#
use strict;
use libdb;
sub DoUpdate($$$)
{
my ($dbhandle, $dbname, $version) = @_;
DBQueryFatal("REPLACE INTO event_objecttypes VALUES (20,'BSTORE')");
return 0;
}
tbsetup/ns2ir/sim.tcl.in
View file @
41bfeaeb
# -*- tcl -*-
#
# Copyright
(
c
)
2000-201
4
University of Utah and the Flux Group.
# Copyright
(
c
)
2000-201
5
University of Utah and the Flux Group.
#
#
{{{
EMULAB-LICENSE
#
...
...
@@ -821,6 +821,9 @@ Simulator instproc run {} {
$self spitxml_data
"virt_agents"
[
list
"vnode"
"vname"
"objecttype"
]
[
list
"*"
"slothd"
$objtypes
(
SLOTHD
)
]
# Per-experiment event to shutdown remote blockstores
$self spitxml_data
"virt_agents"
[
list
"vnode"
"vname"
"objecttype"
]
[
list
"*"
"rem-bstore"
$objtypes
(
BSTORE
)
]
if
{[
array exists ::opt
]}
{
for
{
set i 0
}
{
$i
< $optarray_count
}
{
incr i
}
{
set oname $optarray_order
(
$i
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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