6543/davfs2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

retry failed uploads with increasing delay

Browse Source
This commit is contained in:
wbaumann 2009-06-07 15:17:14 +00:00
parent 0b8556f838
commit 8e213f10fe
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -5,6 +5,11 @@ ChangeLog for davfs2
* webdav.c, prop_result: * webdav.c, prop_result:
If property not found try property without namespace. If property not found try property without namespace.
(idea by Dirk Arend <d.arend@avm.de>) (idea by Dirk Arend <d.arend@avm.de>)
* cache.c, add_to_changed:
Fixed: wrong size in malloc.
* cache.c:
When upload fails temporarily: retry with
increasing delays.


2009-06-06 Werner Baumann (werner.baumann@onlinehome.de) 2009-06-06 Werner Baumann (werner.baumann@onlinehome.de)
* cache.c, dav_statfs: * cache.c, dav_statfs:

25
src/cache.c
View File

@ -124,6 +124,8 @@ static const char* const type[] = {
[END] = NULL [END] = NULL
}; };


#define MAX_UPLOAD_ATTEMPTS 20



/* Private global variables */ /* Private global variables */
/*==========================*/ /*==========================*/
@ -297,6 +299,20 @@ remove_from_tree(dav_node *node);


static void remove_node(dav_node *node); static void remove_node(dav_node *node);


static inline int
set_next_upload_attempt(dav_node *node)
{
dav_node_list_item *item = changed;
while (item && item->node != node)
item = item->next;
if (!item) return 0;
item->attempts++;
if (item->attempts > MAX_UPLOAD_ATTEMPTS)
return -1;
item->save_at += item->attempts * min_retry;
return 0;
}

static inline void static inline void
set_upload_time(dav_node *node) set_upload_time(dav_node *node)
{ {
@ -764,7 +780,8 @@ dav_tidy_cache(void)
dav_get_webdav_error()); dav_get_webdav_error());
} }
if (ret == EACCES || ret == EINVAL || ret == ENOENT if (ret == EACCES || ret == EINVAL || ret == ENOENT
|| ret == EPERM || ret == ENOSPC || ret == EEXIST) { || ret == EPERM || ret == ENOSPC || ret == EEXIST
|| set_next_upload_attempt(node) < 0) {
dav_unlock(node->path, &node->lock_expire); dav_unlock(node->path, &node->lock_expire);
delete_cache_file(node->parent); delete_cache_file(node->parent);
node->parent->utime = 0; node->parent->utime = 0;
@ -858,7 +875,8 @@ dav_close(dav_node *node, int fd, int flags, pid_t pid, pid_t pgid)
dav_get_webdav_error()); dav_get_webdav_error());
} }
if (ret == EACCES || ret == EINVAL || ret == ENOENT if (ret == EACCES || ret == EINVAL || ret == ENOENT
|| ret == EPERM || ret == ENOSPC || ret == EEXIST) { || ret == EPERM || ret == ENOSPC || ret == EEXIST
|| set_next_upload_attempt(node) < 0) {
dav_unlock(node->path, &node->lock_expire); dav_unlock(node->path, &node->lock_expire);
delete_cache_file(node->parent); delete_cache_file(node->parent);
node->parent->utime = 0; node->parent->utime = 0;
@ -1644,11 +1662,12 @@ add_to_changed(dav_node *node)
return; return;
chp = &(*chp)->next; chp = &(*chp)->next;
} }
*chp = (dav_node_list_item *) malloc(sizeof(*chp)); *chp = (dav_node_list_item *) malloc(sizeof(dav_node_list_item));
if (!*chp) if (!*chp)
abort(); abort();
(*chp)->node = node; (*chp)->node = node;
(*chp)->next = NULL; (*chp)->next = NULL;
(*chp)->attempts = 0;
(*chp)->save_at = 0; (*chp)->save_at = 0;
nchanged++; nchanged++;
} }

1
src/cache.h
View File

@ -140,6 +140,7 @@ typedef struct dav_node_item dav_node_list_item;
struct dav_node_item { struct dav_node_item {
dav_node_list_item *next; dav_node_list_item *next;
dav_node *node; dav_node *node;
int attempts;
time_t save_at; time_t save_at;
}; };