Changeset: eb5e697c839d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/eb5e697c839d Modified Files: tools/merovingian/ChangeLog.Jul2021 tools/merovingian/client/monetdb.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/forkmserver.c Branch: Jul2021 Log Message:
Deprecate profilerstart and profilerstop commands diffs (85 lines): diff --git a/tools/merovingian/ChangeLog.Jul2021 b/tools/merovingian/ChangeLog.Jul2021 --- a/tools/merovingian/ChangeLog.Jul2021 +++ b/tools/merovingian/ChangeLog.Jul2021 @@ -1,6 +1,17 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog +* Mon May 10 2021 Panagiotis Koutsourakis <[email protected]> +- Deprecate `profilerstart` and `profilerstop` commands. Since + stethoscope is a separate project (https://github.com/MonetDBSolutions/monetdb-pystethoscope) + the installation directory is not standard anymore. `profilerstart` and + `profilerstop` commands assume that the stethoscope executable is in the + same directory as `mserver5`. This is no longer necessarily true since + stethoscope can now be installed in a python virtual environment. The + commands still work if stethoscope is installed using the official + MonetDB installers, or if a symbolic link is created in the directory + where `mserver5` is located. + * Mon Apr 12 2021 Sjoerd Mullender <[email protected]> - The exittimeout value can now be set to a negative value (e.g. -1) to indicate that when stopping the dbfarm (using monetdbd stop dbfarm), diff --git a/tools/merovingian/client/monetdb.c b/tools/merovingian/client/monetdb.c --- a/tools/merovingian/client/monetdb.c +++ b/tools/merovingian/client/monetdb.c @@ -1704,12 +1704,14 @@ command_release(int argc, char *argv[]) static int command_profilerstart(int argc, char *argv[]) { + fprintf(stderr, "The command \"profilerstart\" is deprecated and will be removed in a future MonetDB version.\n"); return simple_command(argc, argv, "profilerstart", "started profiler", true); } static int command_profilerstop(int argc, char *argv[]) { + fprintf(stderr, "The command \"profilerstop\" is deprecated and will be removed in a future MonetDB version.\n"); return simple_command(argc, argv, "profilerstop", "stopped profiler", true); } diff --git a/tools/merovingian/daemon/controlrunner.c b/tools/merovingian/daemon/controlrunner.c --- a/tools/merovingian/daemon/controlrunner.c +++ b/tools/merovingian/daemon/controlrunner.c @@ -677,6 +677,8 @@ static void ctl_handle_client( } else if (strncmp(p, "profilerstart", strlen("profilerstart")) == 0) { char *log_path = NULL; char *e = fork_profiler(q, &stats, &log_path); + Mfprintf(_mero_ctlout, "The command \"profilerstart\" is deprecated" + " and will be removed in a future MonetDB version.\n"); if (e != NULL) { Mfprintf(_mero_ctlerr, "%s: failed to start the profiler " "database '%s': %s\n", origin, q, getErrMsg(e)); @@ -697,6 +699,8 @@ static void ctl_handle_client( free(log_path); } else if (strncmp(p, "profilerstop", strlen("profilerstop")) == 0) { char *e = shutdown_profiler(q, &stats); + Mfprintf(_mero_ctlout, "The command \"profilerstop\" is deprecated" + " and will be removed in a future MonetDB version.\n"); if (e != NULL) { Mfprintf(_mero_ctlerr, "%s: failed to shutdown the profiler " "database '%s': %s\n", origin, q, getErrMsg(e)); diff --git a/tools/merovingian/daemon/forkmserver.c b/tools/merovingian/daemon/forkmserver.c --- a/tools/merovingian/daemon/forkmserver.c +++ b/tools/merovingian/daemon/forkmserver.c @@ -919,7 +919,9 @@ fork_profiler(const char *dbname, sabdb tmp_exe = strdup(_mero_mserver); if (tmp_exe == NULL) { pthread_mutex_unlock(&dp->fork_lock); - return newErr("Cannot find the profiler executable"); + return newErr("Cannot find the profiler executable\n" + " The python implementation of stethoscope needs" + " to be in the same directory as mserver5."); } else { char *server_filename = "mserver5"; char *profiler_filename = STETHOSCOPE; @@ -944,7 +946,9 @@ fork_profiler(const char *dbname, sabdb * this since if the file were to disappear between this check * and the use, things won't fall apart */ if (stat(profiler_executable, &path_info) == -1) { - error = newErr("Cannot find profiler executable"); + error = newErr("Cannot find the profiler executable\n" + " The python implementation of stethoscope needs" + " to be in the same directory as mserver5."); goto cleanup; } #endif _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
