* Version $Id$
*/
/*
- Copyright (C) 2003-2005 Kern Sibbald
+ Copyright (C) 2003-2006 Kern Sibbald
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
int i;
const char *msg;
+ /* slots are numbered 1 to num_slots */
for (int i=0; i <= num_slots; i++) {
slot_list[i] = 0;
}
i = find_arg_with_value(ua, "slots");
- if (i >= 0) {
+ if (i > 0) {
/* scan slot list in ua->argv[i] */
char *p, *e, *h;
int beg, end;
msg = _("Values must be be greater than zero.\n");
goto bail_out;
}
- if (end >= num_slots) {
+ if (end > num_slots) {
msg = _("Slot too large.\n");
goto bail_out;
}
}
} else {
/* Turn everything on */
- for (i=0; i <= num_slots; i++) {
+ for (i=1; i <= num_slots; i++) {
slot_list[i] = 1;
}
}
-#ifdef xxx_debug
- printf("Slots turned on:\n");
+ Dmsg0(100, "Slots turned on:\n");
for (i=1; i <= num_slots; i++) {
if (slot_list[i]) {
- printf("%d\n", i);
+ Dmsg1(100, "%d\n", i);
}
}
-#endif
return true;
bail_out:
/*
* Update Slots corresponding to Volumes in autochanger
*/
-int update_slots(UAContext *ua)
+void update_slots(UAContext *ua)
{
STORE *store;
vol_list_t *vl, *vol_list = NULL;
char *slot_list;
bool scan;
int max_slots;
- int drive = -1;
+ int drive;
if (!open_db(ua)) {
- return 1;
+ return;
}
- store = get_storage_resource(ua, 1);
+ store = get_storage_resource(ua, true/*arg is storage*/);
if (!store) {
- return 1;
+ return;
}
set_storage(ua->jcr, store);
+ drive = get_storage_drive(ua, store);
- scan = find_arg(ua, N_("scan")) >= 0;
+ scan = find_arg(ua, NT_("scan")) >= 0;
max_slots = get_num_slots_from_SD(ua);
+ Dmsg1(100, "max_slots=%d\n", max_slots);
if (max_slots <= 0) {
bsendmsg(ua, _("No slots in changer to scan.\n"));
- return 1;
+ return;
}
slot_list = (char *)malloc(max_slots+1);
if (!get_user_slot_list(ua, slot_list, max_slots)) {
free(slot_list);
- return 1;
+ return;
}
vol_list = get_vol_list_from_SD(ua, scan);
goto bail_out;
}
+ /* First zap out any InChanger with StorageId=0 */
+ db_sql_query(ua->db, "UPDATE Media SET InChanger=0 WHERE StorageId=0", NULL, NULL);
+
/* Walk through the list updating the media records */
for (vl=vol_list; vl; vl=vl->next) {
if (vl->Slot > max_slots) {
- bsendmsg(ua, _("Slot %d larger than max %d ignored.\n"),
+ bsendmsg(ua, _("Slot %d greater than max %d ignored.\n"),
vl->Slot, max_slots);
continue;
}
Dmsg2(100, "Got Vol=%s from SD for Slot=%d\n", vl->VolName, vl->Slot);
}
slot_list[vl->Slot] = 0; /* clear Slot */
+ memset(&mr, 0, sizeof(mr));
+ mr.Slot = vl->Slot;
+ mr.InChanger = 1;
+ mr.StorageId = store->StorageId;
+ /* Set InChanger to zero for this Slot */
+ db_lock(ua->db);
+ db_make_inchanger_unique(ua->jcr, ua->db, &mr);
+ db_unlock(ua->db);
if (!vl->VolName) {
- Dmsg1(100, "No VolName for Slot=%d setting InChanger to zero.\n", vl->Slot);
- memset(&mr, 0, sizeof(mr));
- mr.Slot = vl->Slot;
- mr.InChanger = 1;
- mr.StorageId = store->StorageId;
- /* Set InChanger to zero for this Slot */
- db_lock(ua->db);
- db_make_inchanger_unique(ua->jcr, ua->db, &mr);
- db_unlock(ua->db);
- bsendmsg(ua, _("No VolName for Slot=%d set InChanger to zero.\n"), vl->Slot);
+ Dmsg1(000, "No VolName for Slot=%d setting InChanger to zero.\n", vl->Slot);
+ bsendmsg(ua, _("No VolName for Slot=%d InChanger set to zero.\n"), vl->Slot);
continue;
}
memset(&mr, 0, sizeof(mr));
db_unlock(ua->db);
continue;
} else {
- bsendmsg(ua, _("Record for Volume \"%s\" not found in catalog.\n"),
- mr.VolumeName);
+ bsendmsg(ua, _("Volume \"%s\" not found in catalog. Slot=%d InChanger set to zero.\n"),
+ mr.VolumeName, vl->Slot);
}
db_unlock(ua->db);
}
free(slot_list);
close_sd_bsock(ua);
- return 1;
+ return;
}
MEDIA_DBR mr, omr;
POOL_DBR pr;
bool print_reminder = true;
+ bool label_barcodes = false;
int ok = FALSE;
- int i;
+ int i, j;
int drive;
bool media_record_exists = false;
static const char *barcode_keyword[] = {
if (!open_db(ua)) {
return 1;
}
+
+ /* Look for one of the barcode keywords */
+ if (!relabel && (i=find_arg_keyword(ua, barcode_keyword)) >= 0) {
+ /* Now find the keyword in the list */
+ if ((j = find_arg(ua, barcode_keyword[i])) > 0) {
+ *ua->argk[j] = 0; /* zap barcode keyword */
+ }
+ label_barcodes = true;
+ }
+
store = get_storage_resource(ua, true/*use default*/);
if (!store) {
return 1;
}
- drive = ua->int32_val;
set_storage(ua->jcr, store);
+ drive = get_storage_drive(ua, store);
- if (!relabel && find_arg_keyword(ua, barcode_keyword) >= 0) {
+ if (label_barcodes) {
label_from_barcodes(ua, drive);
return 1;
}
}
/* If autochanger, request slot */
- if (store->autochanger) {
- i = find_arg_with_value(ua, "slot");
- if (i >= 0) {
- mr.Slot = atoi(ua->argv[i]);
- } else if (!get_pint(ua, _("Enter slot (0 or Enter for none): "))) {
+ i = find_arg_with_value(ua, "slot");
+ if (i >= 0) {
+ mr.Slot = atoi(ua->argv[i]);
+ mr.InChanger = 1; /* assumed if we are labeling it */
+ } else if (store->autochanger) {
+ if (!get_pint(ua, _("Enter slot (0 or Enter for none): "))) {
return 1;
- } else {
- mr.Slot = ua->pint32_val;
}
+ mr.Slot = ua->pint32_val;
mr.InChanger = 1; /* assumed if we are labeling it */
}
mr.StorageId = store->StorageId;
}
bsendmsg(ua, "%4d %s\n", vl->Slot, vl->VolName);
}
- if (!get_cmd(ua, _("Do you want to continue? (y/n): ")) ||
- (ua->cmd[0] != 'y' && ua->cmd[0] != 'Y')) {
+ if (!get_yesno(ua, _("Do you want to continue? (yes|no): ")) ||
+ (ua->pint32_val == 0)) {
goto bail_out;
}
/* Select a pool */
mr.VolBytes = 1;
bstrncpy(mr.VolStatus, "Cleaning", sizeof(mr.VolStatus));
mr.MediaType[0] = 0;
+ mr.StorageId = store->StorageId;
if (!db_update_media_record(ua->jcr, ua->db, &mr)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
}
} else { /* create the media record */
+ if (pr.MaxVols > 0 && pr.NumVols >= pr.MaxVols) {
+ bsendmsg(ua, _("Maximum pool Volumes=%d reached.\n"), pr.MaxVols);
+ goto bail_out;
+ }
set_pool_dbr_defaults_in_media_dbr(&mr, &pr);
bstrncpy(mr.VolStatus, "Cleaning", sizeof(mr.VolStatus));
mr.MediaType[0] = 0;
if (media_record_exists) { /* we update it */
mr->VolBytes = 1;
mr->InChanger = 1;
+ mr->StorageId = ua->jcr->store->StorageId;
if (!db_update_media_record(ua->jcr, ua->db, mr)) {
bsendmsg(ua, "%s", db_strerror(ua->db));
ok = false;
set_pool_dbr_defaults_in_media_dbr(mr, pr);
mr->VolBytes = 1; /* flag indicating Volume labeled */
mr->InChanger = 1;
+ mr->StorageId = ua->jcr->store->StorageId;
+ mr->Enabled = 1;
if (db_create_media_record(ua->jcr, ua->db, mr)) {
bsendmsg(ua, _("Catalog record for Volume \"%s\", Slot %d successfully created.\n"),
mr->VolumeName, mr->Slot);
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger list of volumes */
- bnet_fsend(sd, _("readlabel %s Slot=%d drive=%d\n"), dev_name, Slot, drive);
+ bnet_fsend(sd, NT_("readlabel %s Slot=%d drive=%d\n"), dev_name, Slot, drive);
Dmsg1(100, "Sent: %s", sd->msg);
/* Get Volume name in this Slot */
while (bnet_recv(sd) >= 0) {
bsendmsg(ua, "%s", sd->msg);
Dmsg1(100, "Got: %s", sd->msg);
- if (strncmp(sd->msg, "3001 Volume=", 12) == 0) {
+ if (strncmp(sd->msg, NT_("3001 Volume="), 12) == 0) {
VolName = (char *)malloc(sd->msglen);
- if (sscanf(sd->msg, "3001 Volume=%s Slot=%d", VolName, &rtn_slot) == 2) {
+ if (sscanf(sd->msg, NT_("3001 Volume=%s Slot=%d"), VolName, &rtn_slot) == 2) {
break;
}
free(VolName);
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
/* Ask for autochanger list of volumes */
- bnet_fsend(sd, _("autochanger list %s \n"), dev_name);
+ bnet_fsend(sd, NT_("autochanger list %s \n"), dev_name);
/* Read and organize list of Volumes */
while (bnet_recv(sd) >= 0) {
bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
bash_spaces(dev_name);
- /* Ask for autochanger list of volumes */
- bnet_fsend(sd, _("autochanger slots %s \n"), dev_name);
+ /* Ask for autochanger number of slots */
+ bnet_fsend(sd, NT_("autochanger slots %s\n"), dev_name);
while (bnet_recv(sd) >= 0) {
if (sscanf(sd->msg, "slots=%d\n", &slots) == 1) {
return slots;
}
+/*
+ * We get the number of drives in the changer from the SD
+ */
+int get_num_drives_from_SD(UAContext *ua)
+{
+ STORE *store = ua->jcr->store;
+ char dev_name[MAX_NAME_LENGTH];
+ BSOCK *sd;
+ int drives = 0;
+
+
+ if (!(sd=open_sd_bsock(ua))) {
+ return 0;
+ }
+
+ bstrncpy(dev_name, store->dev_name(), sizeof(dev_name));
+ bash_spaces(dev_name);
+ /* Ask for autochanger number of slots */
+ bnet_fsend(sd, NT_("autochanger drives %s\n"), dev_name);
+
+ while (bnet_recv(sd) >= 0) {
+ if (sscanf(sd->msg, NT_("drives=%d\n"), &drives) == 1) {
+ break;
+ } else {
+ bsendmsg(ua, "%s", sd->msg);
+ }
+ }
+ close_sd_bsock(ua);
+// bsendmsg(ua, _("Device \"%s\" has %d drives.\n"), store->dev_name(), drives);
+ return drives;
+}
+
+
/*
/* Find Pool resource */
ua->jcr->pool = (POOL *)GetResWithName(R_POOL, pr->Name);
if (!ua->jcr->pool) {
- bsendmsg(ua, _("Pool \"%s\" resource not found!\n"), pr->Name);
- return true;
+ bsendmsg(ua, _("Pool \"%s\" resource not found for volume \"%s\"!\n"),
+ pr->Name, mr->VolumeName);
+ return false;
}
if (ua->jcr->pool->cleaning_prefix == NULL) {
return false;
projects / bacula / bacula / blobdiff