Skip to content
Snippets Groups Projects
Commit f80aa8d5 authored by Ruud Overeem's avatar Ruud Overeem
Browse files

BugID: 827 

RB introduced several double definitions causing the load process to abort.
Renamed the components of concern and changed the IP numbers of the nodes.
parent 353a0316
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 71 additions and 105 deletions
MAC/Deployment/data/OTDB/BGL.base → MAC/Deployment/data/OTDB/BGLSection.base
+ 2
− 2
View file @ f80aa8d5
# -- BGL --
# -- BGLSection --
#
# $Id$
#
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
node BGL 1.0.0 development 'node constraint' "BGL Node Settings"
node BGLSection 1.0.0 development 'node constraint' "BGL Node Settings"
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
......
MAC/Deployment/data/OTDB/Cluster.comp
+ 5
− 5
View file @ f80aa8d5
......@@ -6,10 +6,10 @@
#--------------------------------------------------------------------------------------------------------
node Cluster 1.0.0 development 'node constraint' "Cluster Settings"
# name vers qual constr. descr.
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
uses Input 1.0.0 development 1 "Input Nodes"
uses BGL 1.0.0 development 1 "BGL Nodes"
uses Storage 1.0.0 development 1 "Storage Nodes"
uses Imaging 1.0.0 development 1 "Imaging Nodes"
uses InputSection 1.0.0 development 1 "Input Nodes"
uses BGLSection 1.0.0 development 1 "BGL Nodes"
uses StorageSection 1.0.0 development 1 "Storage Nodes"
uses ImagingSection 1.0.0 development 1 "Imaging Nodes"
MAC/Deployment/data/OTDB/ImagingNode.list
+ 19
− 20
View file @ f80aa8d5
IMG000
IMG001
IMG002
IMG003
IMG004
IMG005
IMG006
IMG007
IMG008
IMG009
IMG010
IMG011
IMG012
IMG013
IMG014
IMG015
IMG016
IMG017
IMG018
IMG019
lioff001
lioff002
lioff003
lioff004
lioff005
lioff006
lioff007
lioff008
lioff009
lioff010
lioff011
lioff012
lioff013
lioff014
lioff015
lioff016
lioff017
lioff018
lioff019
MAC/Deployment/data/OTDB/Imaging.base → MAC/Deployment/data/OTDB/ImagingSection.base
+ 2
− 2
View file @ f80aa8d5
# -- Imaging --
# -- ImagingSection --
#
# $Id$
#
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
node Imaging 1.0.0 development 'node constraint' "Imaging Node Settings"
node ImagingSection 1.0.0 development 'node constraint' "Imaging Node Settings"
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
......
MAC/Deployment/data/OTDB/Input.comp deleted 100644 → 0
+ 0
− 18
View file @ 353a0316
# -- Input --
#
# $Id$
#
# --Input Global--
#
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
node Input 1.0.0 development 'node constraint' "Input"
# name dir. type unit prun. vm value constr. descr.
#--------------------------------------------------------------------------------------------------------
par DataSet I text - 10 0 >>Observation.MSNameMask - 'Name of the measurement set'
par _nodes I text - 10 0 '[]' - 'Nodes used by the process'
par _startstopType I text - 10 0 cmdline,mpirun,bgl - 'Method of starting the proces'
par _executable I text - 10 0 - - 'The name of the executable to start'
par _hostname I text - 10 0 - - 'The hostname of the machine to start the proces on'
par _depends I text - 10 0 '[Imager]' - 'The processes that must be finished before this process can start'
MAC/Deployment/data/OTDB/InputNode.list
+ 12
− 12
View file @ f80aa8d5
INP000
INP001
INP002
INP003
INP004
INP005
INP006
INP007
INP008
INP009
INP010
INP011
lii001
lii002
lii003
lii004
lii005
lii006
lii007
lii008
lii009
lii010
lii011
lii012
MAC/Deployment/data/OTDB/Input.base → MAC/Deployment/data/OTDB/InputSection.base
+ 2
− 2
View file @ f80aa8d5
# -- Input --
# -- InputSection --
#
# $Id$
#
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
node Input 1.0.0 development 'node constraint' "Input Node Settings"
node InputSection 1.0.0 development 'node constraint' "Input Node Settings"
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
......
MAC/Deployment/data/OTDB/OnlineCtrl.comp
+ 2
− 2
View file @ f80aa8d5
......@@ -12,7 +12,7 @@ par _hostname I text - 10 0 RS002
uses ApplCtrl 1.0.0 development 1 "The ACC controller"
uses Input 1.0.0 development 1 "Online Applications"
uses InputAppl 1.0.0 development 1 "Online Applications"
uses Fringe 1.0.0 development 1 "Online Applications"
uses OLAP 1.0.0 development 1 "Online Applications"
uses Storage 1.0.0 development 1 "Online Applications"
uses StorageAppl 1.0.0 development 1 "Online Applications"
MAC/Deployment/data/OTDB/Storage.comp deleted 100644 → 0
+ 0
− 18
View file @ 353a0316
# -- Storage --
#
# $Id$
#
# --Storage Global--
#
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
node Storage 1.0.0 development 'node constraint' "Storage"
# name dir. type unit prun. vm value constr. descr.
#--------------------------------------------------------------------------------------------------------
par DataSet I text - 10 0 >>Observation.MSNameMask - 'Name of the measurement set'
par _nodes I text - 10 0 '[]' - 'Nodes used by the process'
par _startstopType I text - 10 0 cmdline,mpirun,bgl - 'Method of starting the proces'
par _executable I text - 10 0 - - 'The name of the executable to start'
par _hostname I text - 10 0 - - 'The hostname of the machine to start the proces on'
par _depends I text - 10 0 '[Imager]' - 'The processes that must be finished before this process can start'
MAC/Deployment/data/OTDB/StorageNode.list
+ 12
− 13
View file @ f80aa8d5
STOR000
STOR001
STOR002
STOR003
STOR004
STOR005
STOR006
STOR007
STOR008
STOR009
STOR010
STOR011
STOR012
list001
list002
list003
list004
list005
list006
list007
list008
list009
list010
list011
list012
MAC/Deployment/data/OTDB/Storage.base → MAC/Deployment/data/OTDB/StorageSection.base
+ 2
− 2
View file @ f80aa8d5
# -- Storage --
# -- StorageSection --
#
# $Id$
#
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
node Storage 1.0.0 development 'node constraint' "Storage Node Settings"
node StorageSection 1.0.0 development 'node constraint' "Storage Node Settings"
# name vers qual constr. descr.
#--------------------------------------------------------------------------------------------------------
......
MAC/Deployment/data/OTDB/create_OTDB_comps
+ 13
− 9
View file @ f80aa8d5
......@@ -107,7 +107,7 @@ expand_marker()
echo -n "# This file was generated by $(basename $0) ${VERSION} on " ; date
cleanlist $1.list | while read nodename
do
number=`echo ${nodename} | sed -e "s/[A-Z]//g"`
number=`echo ${nodename} | sed -e "s/[A-Za-z]//g"`
ipaddr=`echo $3 | sed -e "s/@/${number}/"`
(
echo ""
......@@ -128,9 +128,13 @@ substitute_station()
# expand the nodes
cleanlist $1.list | while read nodename
do
number=`echo ${nodename} | sed -e "s/[A-Z]//g"`
number=`echo ${nodename} | sed -e "s/[A-Za-z]//g"`
arm=`echo ${number} | awk '{ print substr($1,1,1) }'`
ring=`echo ${number} | awk '{ print substr($1,3,1) }'`
ststype=`echo ${nodename} | cut -c1,2`
if [ "${ststype}" -eq "CS" ]; then
number=`echo "${number} 7 / 16 * ${number} 7 % 1 - + p q" | dc`
fi
ipaddr=`echo $3 | sed -e "s/@@@/${number}/" | sed -e "s/@@/${arm}${ring}/"`
(
echo ""
......@@ -183,19 +187,19 @@ do
grep @InputNode@ $file >/dev/null 2>&1
if [ $? -eq 0 ]; then
cleanlist $file | \
expand_marker "InputNode" "@InputNode@" "10.130.150.@" >${outputname}
expand_marker "InputNode" "@InputNode@" "10.20.150.@" >${outputname}
fi
grep @StorageNode@ $file >/dev/null 2>&1
if [ $? -eq 0 ]; then
cleanlist $file | \
expand_marker "StorageNode" "@StorageNode@" "10.130.170.@" >${outputname}
expand_marker "StorageNode" "@StorageNode@" "10.20.170.@" >${outputname}
fi
grep @ImagingNode@ $file >/dev/null 2>&1
if [ $? -eq 0 ]; then
cleanlist $file | \
expand_marker "ImagingNode" "@ImagingNode@" "10.130.180.@" >${outputname}
expand_marker "ImagingNode" "@ImagingNode@" "10.20.160.@" >${outputname}
fi
grep @CoreStation@ $file >/dev/null 2>&1
......@@ -203,10 +207,10 @@ do
(
echo -n "# This file was generated by $(basename $0) ${VERSION} on " ; date
cleanlist $file | \
substitute_station "../PVSS/CoreStations" "@CoreStation@" "10.140.@@@.10" |\
substitute_station "../PVSS/InRingStations" "@InRingStation@" "10.140.1@@.10" |\
substitute_station "../PVSS/OutRingStations" "@OutRingStation@" "10.140.1@@.10" |\
substitute_station "../PVSS/ExtRingStations" "@ExtRingStation@" "10.140.@@@.10"
substitute_station "../PVSS/CoreStations" "@CoreStation@" "10.151.@@@.1" |\
substitute_station "../PVSS/InRingStations" "@InRingStation@" "10.151.1@@.1" |\
substitute_station "../PVSS/OutRingStations" "@OutRingStation@" "10.151.1@@.1" |\
substitute_station "../PVSS/ExtRingStations" "@ExtRingStation@" "10.151.@@@.1"
) >${outputname}
fi
......
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