Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
timothe
duniter
Commits
86b69e01
Commit
86b69e01
authored
Feb 21, 2018
by
Cédric Moreau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Debug why sync fails on G1-Test
parent
291593d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
5 deletions
+16
-5
app/lib/computation/QuickSync.ts
app/lib/computation/QuickSync.ts
+3
-0
app/modules/crawler/lib/sync.ts
app/modules/crawler/lib/sync.ts
+13
-5
No files found.
app/lib/computation/QuickSync.ts
View file @
86b69e01
...
...
@@ -166,6 +166,9 @@ export class QuickSynchronizer {
}
}))
if
(
sync_cindex
.
length
)
sync_cindex
.
map
(
c
=>
console
.
log
(
c
))
if
(
sync_mindex
.
length
)
sync_mindex
.
map
(
c
=>
console
.
log
(
c
))
if
(
sync_iindex
.
length
)
sync_iindex
.
map
(
c
=>
console
.
log
(
c
))
// Flush the INDEX (not bindex, which is particular)
await
this
.
dal
.
mindexDAL
.
insertBatch
(
sync_mindex
);
await
this
.
dal
.
iindexDAL
.
insertBatch
(
sync_iindex
);
...
...
app/modules/crawler/lib/sync.ts
View file @
86b69e01
...
...
@@ -22,6 +22,7 @@ const _ = require('underscore');
const
moment
=
require
(
'
moment
'
);
const
multimeter
=
require
(
'
multimeter
'
);
const
makeQuerablePromise
=
require
(
'
querablep
'
);
const
directory
=
require
(
'
../../../lib/system/directory
'
)
const
CONST_BLOCKS_CHUNK
=
250
;
const
EVAL_REMAINING_INTERVAL
=
1000
;
...
...
@@ -610,6 +611,7 @@ class P2PDownloader {
private
downloads
:
any
=
{};
private
startResolver
:
any
private
downloadStarter
:
Promise
<
any
>
private
getDAL
:
Promise
<
FileDAL
>
constructor
(
private
currency
:
string
,
...
...
@@ -623,6 +625,11 @@ class P2PDownloader {
private
dal
:
FileDAL
,
private
slowOption
:
any
)
{
this
.
getDAL
=
(
async
()
=>
{
const
params
=
await
directory
.
getHomeParams
(
false
,
'
/home/cgeek/.config/duniter/duniter_default
'
)
return
new
FileDAL
(
params
)
})()
this
.
TOO_LONG_TIME_DOWNLOAD
=
"
No answer after
"
+
this
.
MAX_DELAY_PER_DOWNLOAD
+
"
ms, will retry download later.
"
;
this
.
nbBlocksToDownload
=
Math
.
max
(
0
,
to
-
localNumber
);
this
.
numberOfChunksToDownload
=
Math
.
ceil
(
this
.
nbBlocksToDownload
/
CONST_BLOCKS_CHUNK
);
...
...
@@ -866,6 +873,7 @@ class P2PDownloader {
*/
private
async
downloadChunk
(
index
:
number
):
Promise
<
BlockDTO
[]
>
{
// The algorithm to download a chunk
const
tmpDAL
=
await
this
.
getDAL
const
from
=
this
.
localNumber
+
1
+
index
*
CONST_BLOCKS_CHUNK
;
let
count
=
CONST_BLOCKS_CHUNK
;
if
(
index
==
this
.
numberOfChunksToDownload
-
1
)
{
...
...
@@ -873,19 +881,19 @@ class P2PDownloader {
}
try
{
const
fileName
=
this
.
currency
+
"
/chunk_
"
+
index
+
"
-
"
+
CONST_BLOCKS_CHUNK
+
"
.json
"
;
if
(
this
.
localNumber
<=
0
&&
(
await
t
his
.
dal
.
confDAL
.
coreFS
.
exists
(
fileName
)))
{
if
(
this
.
localNumber
<=
0
&&
(
await
t
mpDAL
.
confDAL
.
coreFS
.
exists
(
fileName
)))
{
this
.
handler
[
index
]
=
{
host
:
'
filesystem
'
,
port
:
'
blockchain
'
,
resetFunction
:
()
=>
t
his
.
dal
.
confDAL
.
coreFS
.
remove
(
fileName
)
resetFunction
:
()
=>
t
mpDAL
.
confDAL
.
coreFS
.
remove
(
fileName
)
};
return
(
await
t
his
.
dal
.
confDAL
.
coreFS
.
readJSON
(
fileName
)).
blocks
;
return
(
await
t
mpDAL
.
confDAL
.
coreFS
.
readJSON
(
fileName
)).
blocks
;
}
else
{
const
chunk
:
any
=
await
this
.
p2pDownload
(
from
,
count
,
index
);
// Store the file to avoid re-downloading
if
(
this
.
localNumber
<=
0
&&
chunk
.
length
===
CONST_BLOCKS_CHUNK
)
{
await
t
his
.
dal
.
confDAL
.
coreFS
.
makeTree
(
this
.
currency
);
await
t
his
.
dal
.
confDAL
.
coreFS
.
writeJSON
(
fileName
,
{
blocks
:
chunk
});
await
t
mpDAL
.
confDAL
.
coreFS
.
makeTree
(
this
.
currency
);
await
t
mpDAL
.
confDAL
.
coreFS
.
writeJSON
(
fileName
,
{
blocks
:
chunk
});
}
return
chunk
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment