He eventually closed out a 7-6 7-6 6-4 victory on Court One at Roland Garros after two hours 21 minutes.
The 17th seed will next play Dutch lucky loser Igor Sisjling for a place in the last 32, the furthest he has reached in the clay court grand slam.