Yes they have to wrap up before the full Senate vote on June 7th (which will be a vote of the committee of the whole). That’s why the agreement to vote on that date was important it prevented Conservatives from delaying beyond that point.
As for House of Commons committees the Liberals have a majority government so they control the agenda and could invoke closure (limit amount of time for debate) as they see fit.
News 
Market Data 
Discover 
