index 770e22f23f61f23abe86a17ea282ec7530a5b41b..2c9a280909df2645d73706538e67a22e3c23d221 100644 (file)
int eat_tag(char **, char *);
int read_tag(char **, char *, char *, void *);
int xml2rrd(char*, rrd_t*, char);
int eat_tag(char **, char *);
int read_tag(char **, char *, char *, void *);
int xml2rrd(char*, rrd_t*, char);
-int rrd_write(char *, rrd_t *);
+int rrd_write(char *, rrd_t *, char);
void parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index);
void parse_patch1028_CDP_params(char **buf, rrd_t *rrd, int rra_index, int ds_index);
void parse_FAILURES_history(char **buf, rrd_t *rrd, int rra_index, int ds_index);
void parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index);
void parse_patch1028_CDP_params(char **buf, rrd_t *rrd, int rra_index, int ds_index);
void parse_FAILURES_history(char **buf, rrd_t *rrd, int rra_index, int ds_index);
strcpy(rrd->stat_head->cookie,RRD_COOKIE);
read_tag(&ptr,"version","%4[0-9]",rrd->stat_head->version);
/* added primitive version checking */
strcpy(rrd->stat_head->cookie,RRD_COOKIE);
read_tag(&ptr,"version","%4[0-9]",rrd->stat_head->version);
/* added primitive version checking */
- if (atoi(rrd -> stat_head -> version) != 2)
+ if (atoi(rrd -> stat_head -> version) > atoi(RRD_VERSION) )
{
{
- rrd_set_error("Incompatible file version, detected version %s, required version %s\n",
- rrd -> stat_head -> version, RRD_VERSION);
+ rrd_set_error("Incompatible file version, detected version %s is bigger than supported version %s\n",
+ rrd -> stat_head -> version, RRD_VERSION );
+ free(rrd -> stat_head);
+ return -1;
+ }
+ if (atoi(rrd -> stat_head -> version) < 2)
+ {
+ rrd_set_error("Can only restore version >= 2 (Not %s). Dump your rrd using a current rrdtool dump.", rrd -> stat_head -> version );
free(rrd -> stat_head);
return -1;
}
free(rrd -> stat_head);
return -1;
}
/* create and empty rrd file according to the specs given */
int
/* create and empty rrd file according to the specs given */
int
-rrd_write(char *file_name, rrd_t *rrd)
+rrd_write(char *file_name, rrd_t *rrd, char force_overwrite)
{
unsigned long i,ii,val_cnt;
FILE *rrd_file=NULL;
{
unsigned long i,ii,val_cnt;
FILE *rrd_file=NULL;
+ int fdflags;
+ int fd;
if (strcmp("-",file_name)==0){
if (strcmp("-",file_name)==0){
- *rrd_file= *stdout;
+ rrd_file= stdout;
} else {
} else {
- int fd = open(file_name,O_RDWR|O_CREAT|O_EXCL);
+ fdflags = O_WRONLY|O_CREAT;
+ if (force_overwrite == 0) {
+ fdflags |= O_EXCL;
+ }
+ fd = open(file_name,fdflags,0666);
if (fd == -1 || (rrd_file = fdopen(fd,"wb")) == NULL) {
if (fd == -1 || (rrd_file = fdopen(fd,"wb")) == NULL) {
- rrd_set_error("creating '%s': %s",file_name,strerror(errno));
- rrd_free(rrd);
+ rrd_set_error("creating '%s': %s",file_name,rrd_strerror(errno));
if (fd != -1)
close(fd);
return(-1);
if (fd != -1)
close(fd);
return(-1);
fwrite(rrd->rra_def,
sizeof(rra_def_t), rrd->stat_head->rra_cnt, rrd_file);
fwrite(rrd->rra_def,
sizeof(rra_def_t), rrd->stat_head->rra_cnt, rrd_file);
-
- fwrite(rrd->live_head, sizeof(live_head_t),1, rrd_file);
+
+ /* maybe the xml hold an old formatted rrd */
+ if (atoi(rrd->stat_head->version) < 3)
+ fwrite(&(rrd->live_head->last_up), sizeof(long),1, rrd_file);
+ else
+ fwrite(rrd->live_head, sizeof(live_head_t),1, rrd_file);
fwrite( rrd->pdp_prep, sizeof(pdp_prep_t),rrd->stat_head->ds_cnt,rrd_file);
fwrite( rrd->pdp_prep, sizeof(pdp_prep_t),rrd->stat_head->ds_cnt,rrd_file);
rrd_t rrd;
char *buf;
char rc = 0;
rrd_t rrd;
char *buf;
char rc = 0;
+ char force_overwrite = 0;
/* init rrd clean */
rrd_init(&rrd);
if (argc<3) {
/* init rrd clean */
rrd_init(&rrd);
if (argc<3) {
- rrd_set_error("usage rrdtool %s [--range-check/-r] file.xml file.rrd",argv[0]);
+ rrd_set_error("usage rrdtool %s [--range-check/-r] [--force-overwrite/-f] file.xml file.rrd",argv[0]);
return -1;
}
return -1;
}
static struct option long_options[] =
{
{"range-check", required_argument, 0, 'r'},
static struct option long_options[] =
{
{"range-check", required_argument, 0, 'r'},
+ {"force-overwrite", required_argument, 0, 'f'},
{0,0,0,0}
};
int option_index = 0;
int opt;
{0,0,0,0}
};
int option_index = 0;
int opt;
- opt = getopt_long(argc, argv, "r", long_options, &option_index);
+ opt = getopt_long(argc, argv, "r:f", long_options, &option_index);
if (opt == EOF)
break;
if (opt == EOF)
break;
case 'r':
rc=1;
break;
case 'r':
rc=1;
break;
+ case 'f':
+ force_overwrite=1;
+ break;
default:
default:
- rrd_set_error("usage rrdtool %s [--range-check|-r] file.xml file.rrd",argv[0]);
- return -1;
+ rrd_set_error("usage rrdtool %s [--range-check|-r] [--force-overwrite/-f] file.xml file.rrd",argv[0]);
+ return -1;
break;
}
}
break;
}
}
return -1;
}
free(buf);
return -1;
}
free(buf);
- if(rrd_write(argv[optind+1],&rrd)==-1){
+ if(rrd_write(argv[optind+1],&rrd,force_overwrite)==-1){
rrd_free(&rrd);
return -1;
};
rrd_free(&rrd);
return -1;
};
/* a backwards compatibility routine that will parse the RRA params section
* generated by the aberrant patch to 1.0.28. */
/* a backwards compatibility routine that will parse the RRA params section
* generated by the aberrant patch to 1.0.28. */
+
void
parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index)
{
void
parse_patch1028_RRA_params(char **buf, rrd_t *rrd, int rra_index)
{
{
char history[MAX_FAILURES_WINDOW_LEN + 1];
char *violations_array;
{
char history[MAX_FAILURES_WINDOW_LEN + 1];
char *violations_array;
- short i;
+ unsigned short i;
/* 28 = MAX_FAILURES_WINDOW_LEN */
read_tag(buf, "history", "%28[0-1]", history);
/* 28 = MAX_FAILURES_WINDOW_LEN */
read_tag(buf, "history", "%28[0-1]", history);