From 6c5fd95d8259fef20dabe0255c274e1dc65a8ed9 Mon Sep 17 00:00:00 2001
From: Sven Duscha <duscha@astron.nl>
Date: Mon, 28 Mar 2011 13:56:54 +0000
Subject: [PATCH] Bug1644: made error messages on failed registration of
Control, Kernel and Solver more verbose; giving hint on stale state in
database
---
CEP/Calibration/BBSControl/src/CalSessionTransactors.cc | 2 +-
CEP/Calibration/BBSControl/src/KernelProcessControl.cc | 4 +++-
CEP/Calibration/BBSControl/src/SolverProcessControl.cc | 4 +++-
CEP/Calibration/BBSControl/src/calibrate | 8 ++++----
CEP/Calibration/BBSControl/src/calibrate-part | 1 +
5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/CEP/Calibration/BBSControl/src/CalSessionTransactors.cc b/CEP/Calibration/BBSControl/src/CalSessionTransactors.cc
index 7214d320b7b..f72f5811ee7 100644
--- a/CEP/Calibration/BBSControl/src/CalSessionTransactors.cc
+++ b/CEP/Calibration/BBSControl/src/CalSessionTransactors.cc
@@ -220,7 +220,7 @@ void PQRegisterAsKernel::operator()(argument_type &transaction)
<< pack_vector(transaction, itsGrid[0]->uppers()) << "',E'"
<< pack_vector(transaction, itsGrid[1]->lowers()) << "',E'"
<< pack_vector(transaction, itsGrid[1]->uppers()) << "')";
-// LOG_DEBUG_STR("Query: " << query.str());
+ LOG_DEBUG_STR("Query: " << query.str());
itsQueryResult = transaction.exec(query.str());
}
diff --git a/CEP/Calibration/BBSControl/src/KernelProcessControl.cc b/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
index a6eadb4833a..51415fb8038 100644
--- a/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
+++ b/CEP/Calibration/BBSControl/src/KernelProcessControl.cc
@@ -213,7 +213,9 @@ namespace LOFAR
// Try to register as kernel.
if(!itsCalSession->registerAsKernel(filesys, path,
itsMeasurement->grid())) {
- LOG_ERROR("Registration denied.");
+ LOG_ERROR_STR("Could not register as kernel. There may be stale"
+ " state in the database for key: " << key);
+ //LOG_ERROR("Registration denied.");
return false;
}
diff --git a/CEP/Calibration/BBSControl/src/SolverProcessControl.cc b/CEP/Calibration/BBSControl/src/SolverProcessControl.cc
index 972dc77def1..04b5b7bd14c 100644
--- a/CEP/Calibration/BBSControl/src/SolverProcessControl.cc
+++ b/CEP/Calibration/BBSControl/src/SolverProcessControl.cc
@@ -154,7 +154,9 @@ namespace LOFAR
// Try to register as solver.
if(!itsCalSession->registerAsSolver(port)) {
- LOG_ERROR("Registration denied.");
+ LOG_ERROR_STR("Could not register as solver. There may be stale"
+ " state in the database for key: " << key);
+ //LOG_ERROR("Registration denied.");
return false;
}
diff --git a/CEP/Calibration/BBSControl/src/calibrate b/CEP/Calibration/BBSControl/src/calibrate
index 6a99cad9ef7..cf12a757894 100755
--- a/CEP/Calibration/BBSControl/src/calibrate
+++ b/CEP/Calibration/BBSControl/src/calibrate
@@ -46,7 +46,7 @@ usage()
echo " -v, --verbose be verbose"
echo " -f, --force expands to --clean, --replace-sky-db,"
echo " --replace-instrument-db"
- echo " -n, --nocolumns do not add imaging columns to MS (default=do it)"
+ echo " -n, --no-columns do not add imaging columns to MS (default=do it)"
echo " --dry do not start any processes"
echo " --clean clean control database for the specified key"
echo " --key keyname unique key to identify the session"
@@ -158,7 +158,7 @@ do
elif test "${1}" = "--dry"; then
shift
dry=1
- elif test "${1}" = "-n" -o "${1}" = "--nocolumns"; then
+ elif test "${1}" = "-n" -o "${1}" = "--no-columns"; then
shift
imcolumns=0
elif test "${1}" = "--clean"; then
@@ -549,11 +549,11 @@ fi
event "execute remote KernelControl processes"
if test ${verbose} -eq 1 -o ${dry} -eq 1; then
- echo "startdistproc -useenv -mode 0 -nomasterhost -dsn \"${observation}\" -cdn \"${cluster_desc}\" -logfile \"${key}_calibrate-part_$$.log\" \"${pgmpath}/calibrate-part\" \"${LOFARROOT}\" \"${wd}\" \"${key}\" \"${db_host}\" \"${db_port}\" \"${db_name}\" \"${db_user}\" \"${instrument_basename}\" \"${sky_basename}\" dry ${imcolumns}"
+ echo "startdistproc -useenv -mode 0 -nomasterhost -dsn \"${observation}\" -cdn \"${cluster_desc}\" -logfile \"${key}_calibrate-part_$$.log\" \"${pgmpath}/calibrate-part\" \"${LOFARROOT}\" \"${wd}\" \"${key}\" \"${db_host}\" \"${db_port}\" \"${db_name}\" \"${db_user}\" \"${instrument_basename}\" \"${sky_basename}\" ${imcolumns} dry"
fi
if test ${dry} -eq 0; then
- startdistproc -useenv -mode 0 -nomasterhost -dsn "${observation}" -cdn "${cluster_desc}" -logfile "${key}_calibrate-part_$$.log" "${pgmpath}/calibrate-part" "${LOFARROOT}" "${wd}" "${key}" "${db_host}" "${db_port}" "${db_name}" "${db_user}" "${instrument_basename}" "${sky_basename}" nodry "${imcolumns}"
+ startdistproc -useenv -mode 0 -nomasterhost -dsn "${observation}" -cdn "${cluster_desc}" -logfile "${key}_calibrate-part_$$.log" "${pgmpath}/calibrate-part" "${LOFARROOT}" "${wd}" "${key}" "${db_host}" "${db_port}" "${db_name}" "${db_user}" "${instrument_basename}" "${sky_basename}" "${imcolumns}" nodry
if test $? -ne 0; then
kill_all "${pidlist}"
diff --git a/CEP/Calibration/BBSControl/src/calibrate-part b/CEP/Calibration/BBSControl/src/calibrate-part
index df6c9d46bb1..50f1aaf2ae6 100755
--- a/CEP/Calibration/BBSControl/src/calibrate-part
+++ b/CEP/Calibration/BBSControl/src/calibrate-part
@@ -72,6 +72,7 @@ sourcedb=${13}
dry=${14}
imcolumns=${15}
+
echo "arguments:"
echo " part: ${part}"
echo " filesys: ${filesys}"
--
GitLab