fixes dbs3 timeout issue and dbs3 datastructure issue when it fails

This fixes #4907 and partially of #4891 - dbs timeout retry