I have partial tears in my knees. Not just Aikido, mostly from age and mileage. I did not do surgery. I did the knee stabilization program from physical therapy. I would suggest a complete diagnosis by a competent sport specialist to include an MRI and X-rays.
When training, warm up, watch you form and fatigue level. Don't push too hard when your knees begin to feel pain. Ice.