Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add server version option to baton-do #304

Merged
merged 3 commits into from
Sep 13, 2024
Merged

Add server version option to baton-do #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37404b1
Add option to print server version
mksanger Sep 5, 2024
2b6eee8
small typo
mksanger Sep 12, 2024
978721b
Add error message if failing to get server version
mksanger Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 56 additions & 39 deletions src/baton-do.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@
#include "config.h"
#include "baton.h"

static int debug_flag = 0;
static int help_flag = 0;
static int no_error_flag = 0;
static int silent_flag = 0;
static int single_server_flag = 0;
static int unbuffered_flag = 0;
static int unsafe_flag = 0;
static int verbose_flag = 0;
static int version_flag = 0;
static int wlock_flag = 0;
static int debug_flag = 0;
static int help_flag = 0;
static int no_error_flag = 0;
static int server_version_flag = 0;
static int silent_flag = 0;
static int single_server_flag = 0;
static int unbuffered_flag = 0;
static int unsafe_flag = 0;
static int verbose_flag = 0;
static int version_flag = 0;
static int wlock_flag = 0;

static size_t default_buffer_size = 1024 * 64 * 16 * 2;

Expand All @@ -51,16 +52,17 @@ int main(int argc, char *argv[]) {
while (1) {
static struct option long_options[] = {
// Flag options
{"debug", no_argument, &debug_flag, 1},
{"help", no_argument, &help_flag, 1},
{"no-error", no_argument, &no_error_flag, 1},
{"silent", no_argument, &silent_flag, 1},
{"single-server", no_argument, &single_server_flag, 1},
{"unbuffered", no_argument, &unbuffered_flag, 1},
{"unsafe", no_argument, &unsafe_flag, 1},
{"verbose", no_argument, &verbose_flag, 1},
{"version", no_argument, &version_flag, 1},
{"wlock", no_argument, &wlock_flag, 1},
{"debug", no_argument, &debug_flag, 1},
{"help", no_argument, &help_flag, 1},
{"no-error", no_argument, &no_error_flag, 1},
{"server-version", no_argument, &server_version_flag, 1},
{"silent", no_argument, &silent_flag, 1},
{"single-server", no_argument, &single_server_flag, 1},
{"unbuffered", no_argument, &unbuffered_flag, 1},
{"unsafe", no_argument, &unsafe_flag, 1},
{"verbose", no_argument, &verbose_flag, 1},
{"version", no_argument, &version_flag, 1},
{"wlock", no_argument, &wlock_flag, 1},
// Indexed options
{"connect-time", required_argument, NULL, 'c'},
{"file", required_argument, NULL, 'f'},
Expand Down Expand Up @@ -123,25 +125,26 @@ int main(int argc, char *argv[]) {
" Performs remote operations as described in the JSON\n"
" input file.\n"
"\n"
" --connect-time The duration in seconds after which a connection\n"
" to iRODS will be refreshed (closed and reopened\n"
" between JSON documents) to allow iRODS server\n"
" resources to be released. Optional, defaults to\n"
" 10 minutes.\n"
" --file The JSON file describing the operations.\n"
" Optional, defaults to STDIN.\n"
" --no-error Do not return a non-zero exit code on iRODS\n"
" errors. Errors will still be reported in-band\n"
" as JSON responses.\n"
" --silent Silence error messages.\n"
" --single-server Only connect to a single iRODS server\n"
" --unbuffered Flush print operations for each JSON object.\n"

" --verbose Print verbose messages to STDERR.\n"
" --version Print the version number and exit.\n"
" --wlock Enable server-side advisory write locking.\n"
" Optional, defaults to false.\n"
" --zone The zone to operate within. Optional.\n";
" --connect-time The duration in seconds after which a connection\n"
" to iRODS will be refreshed (closed and reopened\n"
" between JSON documents) to allow iRODS server\n"
" resources to be released. Optional, defaults to\n"
" 10 minutes.\n"
" --file The JSON file describing the operations.\n"
" Optional, defaults to STDIN.\n"
" --no-error Do not return a non-zero exit code on iRODS\n"
" errors. Errors will still be reported in-band\n"
" as JSON responses.\n"
" --server-version Print the version of the server and exit.\n"
" --silent Silence error messages.\n"
" --single-server Only connect to a single iRODS server\n"
" --unbuffered Flush print operations for each JSON object.\n"

" --verbose Print verbose messages to STDERR.\n"
" --version Print the version number and exit.\n"
" --wlock Enable server-side advisory write locking.\n"
" Optional, defaults to false.\n"
" --zone The zone to operate within. Optional.\n";

if (help_flag) {
printf("%s\n",help);
Expand All @@ -153,6 +156,20 @@ int main(int argc, char *argv[]) {
exit(0);
}

if (server_version_flag) {
rodsEnv env;
baton_error_t error;
rcComm_t *connection = rods_login(&env);
char *server_version = get_server_version(connection, &error);
rcDisconnect(connection);
if (error.code != 0) {
logmsg(ERROR, "Failed to get server version");
exit(1);
}
printf("%s\n", server_version);
exit(0);
}

if (single_server_flag) flags = flags | SINGLE_SERVER;
if (unbuffered_flag) flags = flags | FLUSH;
if (unsafe_flag) flags = flags | UNSAFE_RESOLVE;
Expand Down
2 changes: 1 addition & 1 deletion src/write.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int put_data_obj(rcComm_t *conn, const char *local_path, rodsPath_t *rods_path,
char *err_subname;
const char *err_name = rodsErrorName(status, &err_subname);
set_baton_error(error, status,
"Failed calculate a local checksum for: '%s' "
"Failed to calculate a local checksum for: '%s' "
"error %d %s", rods_path->outPath, status,
err_name);
goto error;
Expand Down