extern uint32_t newVolSessionId();
/* Forward referenced functions */
-static bool use_device_cmd(JCR *jcr);
+static bool use_storage_cmd(JCR *jcr);
/* Requests from the Director daemon */
static char jobcmd[] = "JobId=%d job=%127s job_name=%127s client_name=%127s "
"type=%d level=%d FileSet=%127s NoAttr=%d SpoolAttr=%d FileSetMD5=%127s "
- "SpoolData=%d WritePartAfterJob=%d";
-static char use_device[] = "use device=%127s media_type=%127s "
- "pool_name=%127s pool_type=%127s PoolId=%lld append=%d";
-static char query_device[] = "query device=%127s";
+ "SpoolData=%d WritePartAfterJob=%d NewVol=%d\n";
+static char use_storage[] = "use storage=%127s media_type=%127s "
+ "pool_name=%127s pool_type=%127s append=%d\n";
+static char use_device[] = "use device=%127s\n";
+//static char query_device[] = "query device=%127s";
/* Responses sent to Director daemon */
static char NOT_open[] = "3925 Device \"%s\" could not be opened or does not exist.\n";
static char BAD_use[] = "3913 Bad use command: %s\n";
static char BAD_job[] = "3915 Bad Job command: %s\n";
-static char OK_query[] = "3001 OK query "
- "append=%d read=%d num_writers=%d "
- "open=%d labeled=%d offline=%d "
- "reserved=%d max_writers=%d "
- "autoselect=%d autochanger=%d "
- "poolid=%s "
- "changer_name=%s media_type=%s volume_name=%s";
-static char BAD_query[] = "3917 Bad query command: %s\n";
+//static char OK_query[] = "3001 OK query\n";
+//static char NO_query[] = "3918 Query failed\n";
+//static char BAD_query[] = "3917 Bad query command: %s\n";
/*
* Director requests us to start a job
char auth_key[100];
BSOCK *dir = jcr->dir_bsock;
POOL_MEM job_name, client_name, job, fileset_name, fileset_md5;
- int JobType, level, spool_attributes, no_attributes, spool_data, write_part_after_job;
+ int JobType, level, spool_attributes, no_attributes, spool_data;
+ int write_part_after_job, NewVol;
+
JCR *ojcr;
/*
if (sscanf(dir->msg, jobcmd, &JobId, job.c_str(), job_name.c_str(),
client_name.c_str(),
&JobType, &level, fileset_name.c_str(), &no_attributes,
- &spool_attributes, fileset_md5.c_str(), &spool_data, &write_part_after_job) != 12) {
+ &spool_attributes, fileset_md5.c_str(), &spool_data,
+ &write_part_after_job, &NewVol) != 13) {
pm_strcpy(jcr->errmsg, dir->msg);
bnet_fsend(dir, BAD_job, jcr->errmsg);
Dmsg1(100, ">dird: %s\n", dir->msg);
jcr->write_part_after_job = write_part_after_job;
jcr->fileset_md5 = get_pool_memory(PM_NAME);
pm_strcpy(jcr->fileset_md5, fileset_md5);
+ jcr->NewVolEachJob = NewVol;
jcr->authenticated = false;
/*
* Wait for the device, media, and pool information
*/
- if (!use_device_cmd(jcr)) {
+ if (!use_storage_cmd(jcr)) {
set_jcr_job_status(jcr, JS_ErrorTerminated);
memset(jcr->sd_auth_key, 0, strlen(jcr->sd_auth_key));
return false;
* Ensure that the device exists and is opened, then store
* the media and pool info in the JCR.
*/
-static bool use_device_cmd(JCR *jcr)
+class DIRSTORE {
+public:
+ alist *device;
+ char name[MAX_NAME_LENGTH];
+ char media_type[MAX_NAME_LENGTH];
+ char pool_name[MAX_NAME_LENGTH];
+ char pool_type[MAX_NAME_LENGTH];
+};
+
+class DIRDEVICE {
+ alist *device;
+};
+
+static bool use_storage_cmd(JCR *jcr)
{
- POOL_MEM dev_name, media_type, pool_name, pool_type;
+ POOL_MEM store_name, dev_name, media_type, pool_name, pool_type;
BSOCK *dir = jcr->dir_bsock;
DEVRES *device;
- uint64_t PoolId;
AUTOCHANGER *changer;
int append;
bool ok;
* use_device for each device that it wants to use.
*/
Dmsg1(100, "<dird: %s", dir->msg);
- ok = sscanf(dir->msg, use_device, dev_name.c_str(), media_type.c_str(),
- pool_name.c_str(), pool_type.c_str(), &PoolId, &append) == 6;
+ ok = sscanf(dir->msg, use_storage, store_name.c_str(),
+ media_type.c_str(), pool_name.c_str(),
+ pool_type.c_str(), &append) == 5;
if (ok) {
- unbash_spaces(dev_name);
+ unbash_spaces(store_name);
unbash_spaces(media_type);
unbash_spaces(pool_name);
unbash_spaces(pool_type);
+ if (bnet_recv(dir) <= 0) {
+ return false;
+ }
+ ok = sscanf(dir->msg, use_device, dev_name.c_str()) == 1;
+ if (!ok) {
+ return false;
+ }
+ /* Eat to BNET_EOD */
+ while (bnet_recv(dir) > 0) {
+ }
LockRes();
foreach_res(device, R_DEVICE) {
/* Find resource, and make sure we were able to open it */
bstrncpy(dcr->pool_type, pool_type, name_len);
bstrncpy(dcr->media_type, media_type, name_len);
bstrncpy(dcr->dev_name, dev_name, name_len);
- dcr->PoolId = PoolId;
jcr->dcr = dcr;
if (append == SD_APPEND) {
- ok = reserve_device_for_append(jcr, device->dev);
+ ok = reserve_device_for_append(dcr);
} else {
- ok = reserve_device_for_read(jcr, device->dev);
+ ok = reserve_device_for_read(dcr);
}
if (!ok) {
bnet_fsend(dir, _("3927 Could not reserve device: %s\n"), dev_name.c_str());
bstrncpy(dcr->dev_name, dev_name, name_len);
jcr->dcr = dcr;
if (append == SD_APPEND) {
- ok = reserve_device_for_append(jcr, device->dev);
+ ok = reserve_device_for_append(dcr);
} else {
- ok = reserve_device_for_read(jcr, device->dev);
+ ok = reserve_device_for_read(dcr);
}
if (!ok) {
Jmsg(jcr, M_WARNING, 0, _("Could not reserve device: %s\n"), dev_name.c_str());
return false; /* ERROR return */
}
+#ifdef needed
/*
* Query Device command from Director
* Sends Storage Daemon's information on the device to the
*/
bool query_cmd(JCR *jcr)
{
- POOL_MEM dev_name;
+ POOL_MEM dev_name, VolumeName, MediaType, ChangerName;
BSOCK *dir = jcr->dir_bsock;
DEVRES *device;
AUTOCHANGER *changer;
bool ok;
- char ed1[50];
Dmsg1(100, "Query_cmd: %s", dir->msg);
ok = sscanf(dir->msg, query_device, dev_name.c_str()) == 1;
if (!device->dev) {
break;
}
- DEVICE *dev = device->dev;
- POOL_MEM VolumeName, MediaType, ChangerName;
UnlockRes();
- if (dev->is_labeled()) {
- pm_strcpy(VolumeName, dev->VolHdr.VolName);
- } else {
- pm_strcpy(VolumeName, "*");
- }
- bash_spaces(VolumeName);
- pm_strcpy(MediaType, device->media_type);
- bash_spaces(MediaType);
- if (device->changer_res) {
- pm_strcpy(ChangerName, device->changer_res->hdr.name);
- bash_spaces(ChangerName);
+ ok = dir_update_device(jcr, device->dev);
+ if (ok) {
+ ok = bnet_fsend(dir, OK_query);
} else {
- pm_strcpy(ChangerName, "*");
+ bnet_fsend(dir, NO_query);
}
- ok =bnet_fsend(dir, OK_query,
- dev->can_append()!=0,
- dev->can_read()!=0, dev->num_writers,
- dev->is_open()!=0, dev->is_labeled()!=0,
- dev->is_offline()!=0, dev->reserved_device,
- dev->is_tape()?100000:1,
- dev->autoselect, 0,
- edit_uint64(dev->PoolId, ed1),
- ChangerName.c_str(), MediaType.c_str(), VolumeName.c_str());
- Dmsg1(100, ">dird: %s\n", dir->msg);
return ok;
}
}
/* Find resource, and make sure we were able to open it */
if (fnmatch(dev_name.c_str(), changer->hdr.name, 0) == 0) {
UnlockRes();
- /* This is mostly to indicate that we are here */
- ok = bnet_fsend(dir, OK_query,
- 0, 0, 0, /* append, read, num_writers */
- 0, 0, 0, /* is_open, is_labeled, offline */
- 0, 0, /* reserved, max_writers */
- 0, 1, /* autoselect, AutoChanger = 1 */
- "0", /* PoolId */
- "*", "*", "*"); /* ChangerName, MediaType, VolName */
- Dmsg1(100, ">dird: %s\n", dir->msg);
+ if (!changer->device || changer->device->size() == 0) {
+ continue; /* no devices */
+ }
+ ok = dir_update_changer(jcr, changer);
+ if (ok) {
+ ok = bnet_fsend(dir, OK_query);
+ } else {
+ bnet_fsend(dir, NO_query);
+ }
return ok;
}
}
return true;
}
+#endif
+
/*
* Destroy the Job Control Record and associated
projects / bacula / bacula / blobdiff