World number one Naomi Osaka was just two points from a sensational Roland Garros exit on Tuesday before securing her place in the second round where she was joined by defending champion Simona Halep who also needed three sets to survive.