add retry feature on broker side; modify QueryRunner inferface and tests

unused flag ?