Question: when was the riot in orange is the new black?
Answer: It began at the end of Season Four, when CO Humphrey brings a gun into the prison that ends up in the hands of Dayanara Diaz, and serves as the main plot for all of Season Five. It's consequences are seen in Season Six.