Oil climbs on supply concerns, recovery in China demand